Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 12216 invoked from network); 29 Jul 2009 02:19:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Jul 2009 02:19:49 -0000 Received: (qmail 45008 invoked by uid 500); 29 Jul 2009 02:19:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 44918 invoked by uid 500); 29 Jul 2009 02:19:49 -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 44909 invoked by uid 99); 29 Jul 2009 02:19:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2009 02:19:49 +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; Wed, 29 Jul 2009 02:19:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A42A23888DD; Wed, 29 Jul 2009 02:19:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r798750 - in /cxf/branches/2.2.x-fixes: ./ tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/ Date: Wed, 29 Jul 2009 02:19:27 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090729021927.5A42A23888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Jul 29 02:19:26 2009 New Revision: 798750 URL: http://svn.apache.org/viewvc?rev=798750&view=rev Log: Merged revisions 798748 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r798748 | dkulp | 2009-07-28 22:13:55 -0400 (Tue, 28 Jul 2009) | 1 line [CXF-1934] with upgrading to JAXB 2.1.12, this can be fixed ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 29 02:19:26 2009 @@ -1 +1 @@ -/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858 4,798654 +/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858 4,798654,798748 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=798750&r1=798749&r2=798750&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Wed Jul 29 02:19:26 2009 @@ -272,9 +272,6 @@ StringTokenizer tokenizer = new StringTokenizer(xjcArgs, ",", false); while (tokenizer.hasMoreTokens()) { String arg = tokenizer.nextToken(); - if ("-npa".equalsIgnoreCase(arg)) { - throw new ToolException("NPA_NOT_SUPPORTED", LOG); - } args.add(arg); LOG.log(Level.FINE, "xjc arg:" + arg); } Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties?rev=798750&r1=798749&r2=798750&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties (original) +++ cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties Wed Jul 29 02:19:26 2009 @@ -21,7 +21,6 @@ GENERATE_TYPES_ERROR = Error generating types. FAIL_TO_GENERATE_TYPES = Failed to generate types. FAIL_TO_CREATE_JAXBBINIDNG_FILE = Fail to create a JAX-B binding file to customize the namepace to package mapping -NPA_NOT_SUPPORTED = The -npa option does not work due to bugzilla entry 576 in the JAX-B reference implementation. Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java?rev=798750&r1=798749&r2=798750&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java (original) +++ cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java Wed Jul 29 02:19:26 2009 @@ -21,13 +21,11 @@ import java.io.File; import org.apache.cxf.tools.common.ToolConstants; -import org.apache.cxf.tools.common.ToolException; import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest; import org.junit.Test; public class JAXBCodeGenOptionTest extends AbstractCodeGenTest { - @org.junit.Ignore // CXF-1934 @Test public void testJaxbNpa() throws Exception { env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/echo_date.wsdl")); @@ -42,13 +40,5 @@ assertFalse(piFile.getAbsolutePath(), piFile.exists()); } - // this case exists only until we can fix CXF-1934 - @Test(expected = ToolException.class) - public void testJaxbNpaError() throws Exception { - env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/echo_date.wsdl")); - env.put(ToolConstants.CFG_XJC_ARGS, "-npa"); - processor.setContext(env); - processor.execute(); - } }