Repository: cxf Updated Branches: refs/heads/master 3e3d4b800 -> 149dcf004
Comment out a part of a test that is very dependent on the xerces version picked up and the jaxb version being used on client and server. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/149dcf00 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/149dcf00 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/149dcf00 Branch: refs/heads/master Commit: 149dcf004a4d095fbfee6f12ed048de2257a5b57 Parents: 3e3d4b8 Author: Daniel Kulp <[email protected]> Authored: Thu May 29 15:31:02 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Thu May 29 15:31:02 2014 -0400 ---------------------------------------------------------------------- systests/jaxws/pom.xml | 4 ---- .../apache/cxf/systest/jaxws/ClientServerMiscTest.java | 11 ++++++----- 2 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/149dcf00/systests/jaxws/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml index d91a613..82538f4 100644 --- a/systests/jaxws/pom.xml +++ b/systests/jaxws/pom.xml @@ -70,10 +70,6 @@ </build> <dependencies> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-javamail_1.4_spec</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/149dcf00/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java index 9e01ece..165f81c 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java @@ -35,8 +35,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Holder; @@ -69,7 +67,6 @@ import org.apache.cxf.ordered_param_holder.ComplexStruct; import org.apache.cxf.ordered_param_holder.OrderedParamHolder; import org.apache.cxf.ordered_param_holder.OrderedParamHolder_Service; import org.apache.cxf.staxutils.StaxUtils; -import org.apache.cxf.systest.jaxws.DocLitBareCodeFirstService.GMonthTest; import org.apache.cxf.systest.jaxws.DocLitWrappedCodeFirstService.CXF2411Result; import org.apache.cxf.systest.jaxws.DocLitWrappedCodeFirstService.CXF2411SubClass; import org.apache.cxf.systest.jaxws.DocLitWrappedCodeFirstService.Foo; @@ -233,13 +230,17 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase { assertNull(ex.getFault().getDetail()); } + //This test will pass/fail completely dependent on the versions of JAXB picked up and what + //version of Xerces is picked up. Newer versions of JAXB will generate "--11Z" (correct per XMLSchema) + //older version will generate "--11--Z". Xerces will only parse "--11--Z". The parser in the JDK + //will depend on the JDK version used. + /* GMonthTest gm = new GMonthTest(); XMLGregorianCalendar dt = DatatypeFactory.newInstance().newXMLGregorianCalendarDate(2010, 11, 16, 0); gm.setValue(dt); GMonthTest gm2 = port.echoGMonthTest(gm); - assertEquals(gm.getValue().getMonth(), gm2.getValue().getMonth()); - + */ }
