cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r798748 - in /cxf/trunk/tools/wsdlto: databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/
Date Wed, 29 Jul 2009 02:13:55 GMT
Author: dkulp
Date: Wed Jul 29 02:13:55 2009
New Revision: 798748

URL: http://svn.apache.org/viewvc?rev=798748&view=rev
Log:
[CXF-1934] with upgrading to JAXB 2.1.12, this can be fixed

Modified:
    cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
    cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java

Modified: cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=798748&r1=798747&r2=798748&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Wed Jul 29 02:13:55 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/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties?rev=798748&r1=798747&r2=798748&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties
(original)
+++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties
Wed Jul 29 02:13:55 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/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java?rev=798748&r1=798747&r2=798748&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
(original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
Wed Jul 29 02:13:55 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();
-    }
 
 }



Mime
View raw message