axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wood...@apache.org
Subject svn commit: r741300 - /webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
Date Thu, 05 Feb 2009 21:31:31 GMT
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()) {



Mime
View raw message