[jbossws-commits] JBossWS SVN: r8320 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Oct 2 09:34:05 EDT 2008
Author: alessio.soldano at jboss.com
Date: 2008-10-02 09:34:05 -0400 (Thu, 02 Oct 2008)
New Revision: 8320
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
[JBWS-2165] rollback -r 8317:8316: setting the factory props doesn't work when previous tests are run loading sjsx factories. The whole testsuite need to be run with the same StAX implementation.
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-10-02 10:43:24 UTC (rev 8319)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-10-02 13:34:05 UTC (rev 8320)
@@ -49,15 +49,6 @@
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare";
-
- private String xmlInputFactoryValue;
- private String xmlOutputFactoryValue;
- private String xmlEventFactoryValue;
-
- private static final String XML_INPUT_FACTORY = "javax.xml.stream.XMLInputFactory";
- private static final String XML_OUTPUT_FACTORY = "javax.xml.stream.XMLOutputFactory";
- private static final String XML_EVENT_FACTORY = "javax.xml.stream.XMLEventFactory";
- private static final String NOT_SET = "NOT_SET";
public static Test suite()
{
@@ -66,18 +57,6 @@
protected void setUp() throws Exception
{
- if (isIntegrationMetro())
- {
- //use Woodstox as a workaround for JBWS-2165 on AS 5
- xmlInputFactoryValue = System.getProperty(XML_INPUT_FACTORY, NOT_SET);
- xmlOutputFactoryValue = System.getProperty(XML_OUTPUT_FACTORY, NOT_SET);
- xmlEventFactoryValue = System.getProperty(XML_EVENT_FACTORY, NOT_SET);
-
- System.setProperty(XML_INPUT_FACTORY, "com.ctc.wstx.stax.WstxInputFactory");
- System.setProperty(XML_OUTPUT_FACTORY, "com.ctc.wstx.stax.WstxOutputFactory");
- System.setProperty(XML_EVENT_FACTORY, "com.ctc.wstx.stax.WstxEventFactory");
- }
-
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -85,40 +64,6 @@
port = service.getPort(MTOMEndpoint.class);
binding = (SOAPBinding)((BindingProvider)port).getBinding();
}
-
- protected void tearDown() throws Exception
- {
- if (isIntegrationMetro())
- {
- //restore StAX implementation factories
- if (NOT_SET.equals(xmlInputFactoryValue))
- {
- System.clearProperty(XML_INPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_INPUT_FACTORY, xmlInputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlOutputFactoryValue))
- {
- System.clearProperty(XML_OUTPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_OUTPUT_FACTORY, xmlOutputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlEventFactoryValue))
- {
- System.clearProperty(XML_EVENT_FACTORY);
- }
- else
- {
- System.setProperty(XML_EVENT_FACTORY, xmlEventFactoryValue);
- }
- }
- }
/**
* Consumption of XOP packages (not inlined) should resolve the correct java type.
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-10-02 10:43:24 UTC (rev 8319)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-10-02 13:34:05 UTC (rev 8320)
@@ -49,16 +49,6 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/wrapped";
private WrappedEndpoint port;
-
- private String xmlInputFactoryValue;
- private String xmlOutputFactoryValue;
- private String xmlEventFactoryValue;
-
- private static final String XML_INPUT_FACTORY = "javax.xml.stream.XMLInputFactory";
- private static final String XML_OUTPUT_FACTORY = "javax.xml.stream.XMLOutputFactory";
- private static final String XML_EVENT_FACTORY = "javax.xml.stream.XMLEventFactory";
- private static final String NOT_SET = "NOT_SET";
-
public static Test suite()
{
@@ -67,18 +57,7 @@
protected void setUp() throws Exception
{
- if (isIntegrationMetro())
- {
- //use Woodstox as a workaround for JBWS-2165 on AS 5
- xmlInputFactoryValue = System.getProperty(XML_INPUT_FACTORY, NOT_SET);
- xmlOutputFactoryValue = System.getProperty(XML_OUTPUT_FACTORY, NOT_SET);
- xmlEventFactoryValue = System.getProperty(XML_EVENT_FACTORY, NOT_SET);
-
- System.setProperty(XML_INPUT_FACTORY, "com.ctc.wstx.stax.WstxInputFactory");
- System.setProperty(XML_OUTPUT_FACTORY, "com.ctc.wstx.stax.WstxOutputFactory");
- System.setProperty(XML_EVENT_FACTORY, "com.ctc.wstx.stax.WstxEventFactory");
- }
-
+
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "WrappedService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -89,40 +68,6 @@
binding.setMTOMEnabled(true);
}
-
- protected void tearDown() throws Exception
- {
- if (isIntegrationMetro())
- {
- //restore StAX implementation factories
- if (NOT_SET.equals(xmlInputFactoryValue))
- {
- System.clearProperty(XML_INPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_INPUT_FACTORY, xmlInputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlOutputFactoryValue))
- {
- System.clearProperty(XML_OUTPUT_FACTORY);
- }
- else
- {
- System.setProperty(XML_OUTPUT_FACTORY, xmlOutputFactoryValue);
- }
-
- if (NOT_SET.equals(xmlEventFactoryValue))
- {
- System.clearProperty(XML_EVENT_FACTORY);
- }
- else
- {
- System.setProperty(XML_EVENT_FACTORY, xmlEventFactoryValue);
- }
- }
- }
public void testParameterAnnotation() throws Exception
{
More information about the jbossws-commits
mailing list