You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wo...@apache.org on 2009/02/05 22:31:31 UTC
svn commit: r741300 -
/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
Author: woodroy
Date: Thu Feb 5 21:31:31 2009
New Revision: 741300
URL: http://svn.apache.org/viewvc?rev=741300&view=rev
Log:
AXIS2-4228
Contributor: Roy Wood
When building with IBM's SDK, set the System Properties for the necessary factory implementations to the appropriate path.
Modified:
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java?rev=741300&r1=741299&r2=741300&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java Thu Feb 5 21:31:31 2009
@@ -106,15 +106,31 @@
if (validate) {
multiRunListener.setFailureMessage(
"Invalid test case; execution failed with SAAJ reference implementation");
- System.setProperty("javax.xml.soap.MessageFactory",
- "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
- System.setProperty("javax.xml.soap.SOAPFactory",
- "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
- System.setProperty("javax.xml.soap.SOAPConnectionFactory",
- "com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
- System.setProperty("javax.xml.soap.MetaFactory",
- "com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl");
+
+ if (System.getProperty("java.vendor").equals("IBM Corporation")) {
+ System.setProperty("javax.xml.soap.MessageFactory",
+ "com.sun.xml.internal.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
+ System.setProperty("javax.xml.soap.SOAPFactory",
+ "com.sun.xml.internal.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
+ System.setProperty("javax.xml.soap.SOAPConnectionFactory",
+ "com.sun.xml.internal.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
+ System.setProperty("javax.xml.soap.MetaFactory",
+ "com.sun.xml.internal.messaging.saaj.soap.SAAJMetaFactoryImpl");
+
+ //Default to the SUN RI
+ } else {
+ System.setProperty("javax.xml.soap.MessageFactory",
+ "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
+ System.setProperty("javax.xml.soap.SOAPFactory",
+ "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
+ System.setProperty("javax.xml.soap.SOAPConnectionFactory",
+ "com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
+ System.setProperty("javax.xml.soap.MetaFactory",
+ "com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl");
+ }
resetSAAJFactories();
+
+ System.out.println("About to invoke super.invokeTestMethod on: " +method.getName());
super.invokeTestMethod(method, multiRunNotifier);
}
if (multiRunListener.isShouldContinue()) {
Re: svn commit: r741300 - /webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
Posted by Andreas Veithen <an...@gmail.com>.
Roy,
As I said in my comment to AXIS2-4228, the factory implementations are
provided by the dependency on saaj-impl (not by the JDK, even on Sun's
JDK). Why would we want to use different implementations on IBM JDKs?
Regards,
On Thu, Feb 5, 2009 at 22:31, <wo...@apache.org> wrote:
> Author: woodroy
> Date: Thu Feb 5 21:31:31 2009
> New Revision: 741300
>
> URL: http://svn.apache.org/viewvc?rev=741300&view=rev
> Log:
> AXIS2-4228
> Contributor: Roy Wood
> When building with IBM's SDK, set the System Properties for the necessary factory implementations to the appropriate path.
>
> Modified:
> webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
>
> Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java?rev=741300&r1=741299&r2=741300&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java (original)
> +++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java Thu Feb 5 21:31:31 2009
> @@ -106,15 +106,31 @@
> if (validate) {
> multiRunListener.setFailureMessage(
> "Invalid test case; execution failed with SAAJ reference implementation");
> - System.setProperty("javax.xml.soap.MessageFactory",
> - "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
> - System.setProperty("javax.xml.soap.SOAPFactory",
> - "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
> - System.setProperty("javax.xml.soap.SOAPConnectionFactory",
> - "com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
> - System.setProperty("javax.xml.soap.MetaFactory",
> - "com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl");
> +
> + if (System.getProperty("java.vendor").equals("IBM Corporation")) {
> + System.setProperty("javax.xml.soap.MessageFactory",
> + "com.sun.xml.internal.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
> + System.setProperty("javax.xml.soap.SOAPFactory",
> + "com.sun.xml.internal.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
> + System.setProperty("javax.xml.soap.SOAPConnectionFactory",
> + "com.sun.xml.internal.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
> + System.setProperty("javax.xml.soap.MetaFactory",
> + "com.sun.xml.internal.messaging.saaj.soap.SAAJMetaFactoryImpl");
> +
> + //Default to the SUN RI
> + } else {
> + System.setProperty("javax.xml.soap.MessageFactory",
> + "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
> + System.setProperty("javax.xml.soap.SOAPFactory",
> + "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
> + System.setProperty("javax.xml.soap.SOAPConnectionFactory",
> + "com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
> + System.setProperty("javax.xml.soap.MetaFactory",
> + "com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl");
> + }
> resetSAAJFactories();
> +
> + System.out.println("About to invoke super.invokeTestMethod on: " +method.getName());
> super.invokeTestMethod(method, multiRunNotifier);
> }
> if (multiRunListener.isShouldContinue()) {
>
>
>