axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wood...@apache.org
Subject svn commit: r741784 - in /webservices/axis2/trunk/java/modules/saaj: pom.xml test/org/apache/axis2/saaj/SAAJTestRunner.java
Date Fri, 06 Feb 2009 23:27:03 GMT
Author: woodroy
Date: Fri Feb  6 23:27:03 2009
New Revision: 741784

URL: http://svn.apache.org/viewvc?rev=741784&view=rev
Log:
AXIS2-4228
Contributor: Roy Wood
Backed out original changed to SAAJTestRunner. Now using Andreas' change to the POM

Modified:
    webservices/axis2/trunk/java/modules/saaj/pom.xml
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java

Modified: webservices/axis2/trunk/java/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/pom.xml?rev=741784&r1=741783&r2=741784&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Fri Feb  6 23:27:03 2009
@@ -85,6 +85,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.parsers</groupId>
+            <artifactId>jaxp-ri</artifactId>
+            <version>1.4.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>

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=741784&r1=741783&r2=741784&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
Fri Feb  6 23:27:03 2009
@@ -107,27 +107,15 @@
             multiRunListener.setFailureMessage(
                     "Invalid test case; execution failed with SAAJ reference implementation");
 
-            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",
+            System.setProperty("javax.xml.soap.MessageFactory",
             		"com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl");
-            	System.setProperty("javax.xml.soap.SOAPFactory",
+            System.setProperty("javax.xml.soap.SOAPFactory",
             		"com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl");
-            	System.setProperty("javax.xml.soap.SOAPConnectionFactory",
+            System.setProperty("javax.xml.soap.SOAPConnectionFactory",
             		"com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory");
-            	System.setProperty("javax.xml.soap.MetaFactory",
+            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());



Mime
View raw message