[jbossws-commits] JBossWS SVN: r17803 - stack/cxf/trunk/modules/dist/src/main/distro.
Author: jim.ma
Date: 2013-07-19 04:22:58 -0400 (Fri, 19 Jul 2013)
New Revision: 17803
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
Log:
Fix binary distribution tests
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-07-18 19:16:28
UTC (rev 17802)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-07-19 08:22:58
UTC (rev 17803)
@@ -657,6 +657,8 @@
</fileset>
<filterset>
<filter token="jboss.bind.address"
value="${node0}"/>
+ <filter token="remote.protocol"
value="${remote.protocol}"/>
+ <filter token="remote.port" value="${remote.port}"/>
</filterset>
</copy>
<copy todir="${tests.output.dir}/test-classes">
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-07-18 19:16:28 UTC (rev
17802)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-07-19 08:22:58 UTC (rev
17803)
@@ -75,9 +75,27 @@
<equals arg1="${jbossws.integration.target}"
arg2="wildfly800"/>
</or>
</condition>
-
+
<property name="deploy.structure"
value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile"
value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ <condition property="remote.port" value="8080">
+ <isset property="jbossws.integration.wildfly80x"/>
+ </condition>
+ <condition property="remote.protocol"
value="http-remoting">
+ <isset property="jbossws.integration.wildfly80x"/>
+ </condition>
+
+ <condition property="remote.port" value="4447">
+ <not>
+ <isset property="jbossws.integration.wildfly80x"/>
+ </not>
+ </condition>
+ <condition property="remote.protocol" value="remote">
+ <not>
+ <isset property="jbossws.integration.wildfly80x"/>
+ </not>
+ </condition>
</target>
<target name="tests-init" depends="init,tests-classpath">