You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/12/30 13:17:15 UTC
svn commit: r1225814 - in /axis/axis1/java/trunk: ./ test/wsdl/interop/
test/wsdl/interop/build.xml
Author: veithen
Date: Fri Dec 30 12:17:15 2011
New Revision: 1225814
URL: http://svn.apache.org/viewvc?rev=1225814&view=rev
Log:
Reintegrated r392364 into the trunk to fix a build failure caused by a 3rd party hosted WSDL that is no longer available.
Modified:
axis/axis1/java/trunk/ (props changed)
axis/axis1/java/trunk/test/wsdl/interop/ (props changed)
axis/axis1/java/trunk/test/wsdl/interop/build.xml
Propchange: axis/axis1/java/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /webservices/axis/trunk/java:392364
Propchange: axis/axis1/java/trunk/test/wsdl/interop/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 30 12:17:15 2011
@@ -1 +1,2 @@
/webservices/axis/branches/AXIS_1_4_FINAL/test/wsdl/interop:530561
+/webservices/axis/trunk/java/test/wsdl/interop:392364
Modified: axis/axis1/java/trunk/test/wsdl/interop/build.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/test/wsdl/interop/build.xml?rev=1225814&r1=1225813&r2=1225814&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/interop/build.xml (original)
+++ axis/axis1/java/trunk/test/wsdl/interop/build.xml Fri Dec 30 12:17:15 2011
@@ -454,18 +454,6 @@ Copyright:
verbose="no"
noimports="no">
</wsdl2java>
- <!-- This tests .NET document/literal WSDL.
- We get this WSDL file from the internet on purpose,
- file is only for reference.
- <wsdl2java url="${axis.home}/test/wsdl/literal/SalesRankNPrice.wsdl"
- -->
- <wsdl2java url="http://www.perfectxml.net/WebServices/SalesRankNPrice/BookService.asmx?WSDL"
- output="${axis.home}/build/work"
- verbose="no"
- serverSide="no"
- testcase="no">
- <mapping namespace="http://www.PerfectXML.com/NETWebSvcs/BookService" package="test.wsdl.literal"/>
- </wsdl2java>
<!-- jaxrpc sample -->
<wsdl2java url="${axis.home}/samples/jaxrpc/hello/HelloWorld.wsdl"
@@ -546,6 +534,18 @@ Copyright:
verbose="yes"
noimports="no">
</wsdl2java>
+
+ // This tests .NET document/literal WSDL.
+ // NOTE: PerfectXML.net is not longer up (tomj 4/7/06)
+ // See test/wsdl/literal for local version
+ <wsdl2java url="http://www.perfectxml.net/WebServices/SalesRankNPrice/BookService.asmx?WSDL"
+ output="${axis.home}/build/work"
+ verbose="no"
+ serverSide="no"
+ testcase="no">
+ <mapping namespace="http://www.PerfectXML.com/NETWebSvcs/BookService" package="test.wsdl.literal"/>
+ </wsdl2java>
+
-->
<copy todir="${build.dir}/work/test/wsdl/interop" overwrite="yes">
@@ -557,9 +557,12 @@ Copyright:
<copy todir="${build.dir}/work/samples" overwrite="yes">
<fileset dir="${samples.dir}">
- <include name="**/*BindingImpl.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="ws-i/scm/**/*.java" />
+ <include name="addr/*BindingImpl.java"/>
+ <include name="echo/*BindingImpl.java"/>
+ <include name="jaxrpc/*BindingImpl.java"/>
+ <include name="addr/*TestCase.java"/>
+ <include name="echo/*TestCase.java"/>
+ <include name="jaxrpc/*TestCase.java"/>
</fileset>
</copy>
@@ -573,7 +576,9 @@ Copyright:
<include name="net/**/*.java" />
<include name="org/**/*.java" />
<include name="interop/**/*.java" />
- <include name="samples/**/*.java" />
+ <include name="samples/addr/*.java" />
+ <include name="samples/echo/*.java" />
+ <include name="samples/jaxrpc/*.java" />
<include name="test/**/*.java" />
<exclude name="test/wsdl/interop3/**/*.java" />
<exclude name="test/wsdl/interop3/**/*.java" />