Author: dims
Date: Tue Aug 23 19:30:55 2005
New Revision: 239510
URL: http://svn.apache.org/viewcvs?rev=239510&view=rev
Log:
Moving whitemesa interop tests to a separate maven goal. Please run "maven
itest" from modules/integration to run that test. i will hook it up better
("maven all-tests" from root) tomorrow.
FYI, right now it fails with an NPE. Gayan, PLEASE fix it ASAP!
Added:
webservices/axis/trunk/java/modules/integration/itest/
webservices/axis/trunk/java/modules/integration/itest-resources/
webservices/axis/trunk/java/modules/integration/itest-resources/interopt/
- copied from r239422,
webservices/axis/trunk/java/modules/integration/test-resources/interopt/
webservices/axis/trunk/java/modules/integration/itest-resources/intregrationRepo/
webservices/axis/trunk/java/modules/integration/itest/org/
webservices/axis/trunk/java/modules/integration/itest/org/apache/
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/
webservices/axis/trunk/java/modules/integration/itest/org/apache/axis2/interopt/whitmesa/
- copied from r239422,
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/interopt/whitmesa/
webservices/axis/trunk/java/modules/integration/project.properties (with
props)
Removed:
webservices/axis/trunk/java/modules/integration/test-resources/interopt/
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/interopt/whitmesa/
Modified:
webservices/axis/trunk/java/modules/integration/maven.xml
webservices/axis/trunk/java/modules/integration/project.xml
webservices/axis/trunk/java/modules/integration/src/org/apache/axis2/interopt/whitemesa/round1/Round1Client.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
Modified: webservices/axis/trunk/java/modules/integration/maven.xml
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/maven.xml?rev=239510&r1=239509&r2=239510&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis/trunk/java/modules/integration/maven.xml Tue Aug 23
19:30:55 2005
@@ -8,6 +8,13 @@
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
<j:set var="samples.dir" value="target/samples"/>
+
+ <postGoal name="itest:compile">
+ <mkdir dir="target/itest-classes/modules"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/itest-classes/modules/addressing.mar"/>
+ </postGoal>
+
<postGoal name="test:compile">
<mkdir dir="target/test-resources/samples/modules"/>
<mkdir dir="target/test-resources/repository-client/modules"/>
Added: webservices/axis/trunk/java/modules/integration/project.properties
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/project.properties?rev=239510&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/integration/project.properties (added)
+++ webservices/axis/trunk/java/modules/integration/project.properties Tue Aug
23 19:30:55 2005
@@ -0,0 +1,25 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+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
Propchange: webservices/axis/trunk/java/modules/integration/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis/trunk/java/modules/integration/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/project.xml?rev=239510&r1=239509&r2=239510&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis/trunk/java/modules/integration/project.xml Tue Aug 23
19:30:55 2005
@@ -162,6 +162,20 @@
<module>true</module>
</properties>
</dependency>
+ <dependency>
+ <groupId>maven-itest-plugin</groupId>
+ <artifactId>maven-itest-plugin</artifactId>
+ <version>1.0</version>
+ <type>plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <properties>
+ <classloader>root</classloader>
+ </properties>
+ </dependency>
</dependencies>
Modified:
webservices/axis/trunk/java/modules/integration/src/org/apache/axis2/interopt/whitemesa/round1/Round1Client.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/src/org/apache/axis2/interopt/whitemesa/round1/Round1Client.java?rev=239510&r1=239509&r2=239510&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/integration/src/org/apache/axis2/interopt/whitemesa/round1/Round1Client.java
(original)
+++
webservices/axis/trunk/java/modules/integration/src/org/apache/axis2/interopt/whitemesa/round1/Round1Client.java
Tue Aug 23 19:30:55 2005
@@ -29,7 +29,7 @@
throw new AxisFault(e);
}
- Call call = new Call("target/test-resources/intregrationRepo");
+ Call call = new Call("target/itest-resources/intregrationRepo");
call.setTo(new EndpointReference(url.toString()));
call.setSoapAction(soapAction);
call.setTransportInfo(Constants.TRANSPORT_HTTP,
Constants.TRANSPORT_HTTP, false);
Modified:
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java?rev=239510&r1=239509&r2=239510&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
(original)
+++
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
Tue Aug 23 19:30:55 2005
@@ -79,7 +79,7 @@
method.addChild(value);
// reqEnv.getBody().addChild(method);
- Call call = new Call("target/test-resources/intregrationRepo");
+ Call call = new Call();
EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:";
+ (UtilServer.TESTING_PORT)
