axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r239976 - in /webservices/axis/trunk/java/modules/integration: ./ itest/org/apache/axis2/interopt/whitmesa/round1/ itest/org/apache/axis2/interopt/whitmesa/round4/complex/ itest/org/apache/axis2/interopt/whitmesa/round4/simple/
Date Thu, 25 Aug 2005 02:05:39 GMT
Author: dims
Date: Wed Aug 24 19:05:34 2005
New Revision: 239976

URL: http://svn.apache.org/viewcvs?rev=239976&view=rev
Log:
switch back to classpath based lookup for the xml files 


Modified:
    webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
    webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
    webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
    webservices/axis/trunk/java/modules/integration/project.properties

Modified: webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java?rev=239976&r1=239975&r2=239976&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
(original)
+++ webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round1/Round1InteropTest.java
Wed Aug 24 19:05:34 2005
@@ -50,7 +50,7 @@
     File file = null;
     String url = "http://soapinterop.java.sun.com:80/round2/base";
     String soapAction = "http://soapinterop.org/";
-    String resFilePath = "itest-resources/interopt/whitemesa/round1/";
+    String resFilePath = "interopt/whitemesa/round1/";
     String tempPath = "";
     Round1ClientUtil util;
     Round1Client client = null;
@@ -167,8 +167,7 @@
                 SOAPBody body = retEnv.getBody();
                 if (!body.hasFault()) {
 
-                    File file = new File(filePath);
-                    FileInputStream stream = new FileInputStream(file);
+                    InputStream stream = Round1InteropTest.class.getClassLoader().getResourceAsStream("/"
+ filePath);
 
                     OMElement firstChild = body.getFirstElement();
                     XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
@@ -184,8 +183,6 @@
         } catch (XMLStreamException e) {
             throw new AxisFault(e);
         } catch (XMLComparisonException e) {
-            throw new AxisFault(e);
-        } catch (FileNotFoundException e) {
             throw new AxisFault(e);
         }
 

Modified: webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java?rev=239976&r1=239975&r2=239976&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
(original)
+++ webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/complex/WhitemesaR4ComplexTest.java
Wed Aug 24 19:05:34 2005
@@ -50,10 +50,10 @@
     }
 
     private boolean Compare(OMElement retEle,String filepath) throws XMLStreamException,
-            XMLComparisonException, java.io.FileNotFoundException {
+            XMLComparisonException {
         boolean compare=false;
         if(retEle!=null){
-            InputStream stream = new java.io.FileInputStream("itest-resources/" + filepath);
+            InputStream stream = WhitemesaR4ComplexTest.class.getClassLoader().getResourceAsStream("/"
+ filepath);
             javax.xml.stream.XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
             OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
             SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();

Modified: webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java?rev=239976&r1=239975&r2=239976&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
(original)
+++ webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/round4/simple/WhitemesaR4SimpleTest.java
Wed Aug 24 19:05:34 2005
@@ -55,10 +55,10 @@
     }
 
     private boolean compare(OMElement retEle,String filePath) throws XMLStreamException,
-            XMLComparisonException, java.io.FileNotFoundException {
+            XMLComparisonException {
         boolean compare = false;
         if(retEle!=null) {
-            InputStream stream = new java.io.FileInputStream("itest-resources/" + filePath);
+            InputStream stream = WhitemesaR4SimpleTest.class.getClassLoader().getResourceAsStream("/"
+ filePath);
             javax.xml.stream.XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
             OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
             SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();

Modified: webservices/axis/trunk/java/modules/integration/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/project.properties?rev=239976&r1=239975&r2=239976&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/project.properties (original)
+++ webservices/axis/trunk/java/modules/integration/project.properties Wed Aug 24 19:05:34
2005
@@ -17,9 +17,14 @@
 maven.repo.remote=http://cvs.apache.org/repository/, http://www.ibiblio.org/maven,http://www.apache.org/dist/java-repository/,http://www.openejb.org/maven
 maven.multiproject.type=jar
 
-maven.itest.resources=${basedir}/itest-resources
 maven.itest.src=${basedir}/itest
 maven.itest.includes=**/*.java
 
 maven.junit.fork=true
 maven.junit.jvmargs=-ea
+
+maven.itest.resources=itestConfig
+
+itestConfig.dir=${basedir}/itest-resources
+itestConfig.includes=**/*.xml
+itestConfig.excludes=
\ No newline at end of file



Mime
View raw message