You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/12/11 20:43:46 UTC

svn commit: r889783 - in /webservices/axis2/trunk/java/modules/saaj: ./ test-resources/ test-resources/saaj-repo/ test/org/apache/axis2/saaj/ test/org/apache/axis2/saaj/integration/

Author: veithen
Date: Fri Dec 11 19:43:45 2009
New Revision: 889783

URL: http://svn.apache.org/viewvc?rev=889783&view=rev
Log:
AXIS2-4575: Fixed failure in mvn eclipse:eclipse (with maven-eclipse-plugin version 2.7) and moved the test repository files to a subfolder. Thanks to Katherine Sanders for pointing out the problem with eclipse:eclipse and proposing a solution.

Added:
    webservices/axis2/trunk/java/modules/saaj/test-resources/saaj-repo/
    webservices/axis2/trunk/java/modules/saaj/test-resources/saaj-repo/axis2.xml
      - copied unchanged from r889776, webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
Removed:
    webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
Modified:
    webservices/axis2/trunk/java/modules/saaj/pom.xml
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.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=889783&r1=889782&r2=889783&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Fri Dec 11 19:43:45 2009
@@ -106,13 +106,6 @@
         <testResources>
             <testResource>
                 <directory>test-resources</directory>
-                <includes>
-                    <include>axis2.xml</include>
-                </includes>
-                <targetPath>../test-resources/saaj-repo</targetPath>
-            </testResource>
-            <testResource>
-                <directory>test-resources</directory>
             </testResource>
         </testResources>
         <plugins>

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java?rev=889783&r1=889782&r2=889783&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java Fri Dec 11 19:43:45 2009
@@ -65,7 +65,7 @@
 //    public static final QName OPERATION_NAME = new QName("echo");
 //
 //    public static final String SAAJ_REPO =
-//            System.getProperty("basedir", ".") + "/" + "target/test-resources/saaj-repo";
+//            System.getProperty("basedir", ".") + "/" + "target/test-classes/saaj-repo";
 //
 //    public SOAPMessageTest(String name) {
 //        super(name);

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=889783&r1=889782&r2=889783&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Fri Dec 11 19:43:45 2009
@@ -73,7 +73,7 @@
     public static final QName OPERATION_NAME = new QName("echo");
 
     public static final String SAAJ_REPO =
-            System.getProperty("basedir", ".") + "/" + "target/test-resources/saaj-repo";
+            System.getProperty("basedir", ".") + "/" + "target/test-classes/saaj-repo";
 
     private String lastSoapAction; // Stores the last SOAP action received by the server