Author: ron.sigal(a)jboss.com Date: 2009-09-22 00:36:54 -0400 (Tue, 22 Sep 2009) New Revision: 5536 Modified: remoting2/branches/2.x/build.xml Log: JBREM-139: Extended wait for connector and servlet installation; doesn't fail if it can't delete files or directories. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2009-09-22 00:09:52 UTC (rev 5535) +++ remoting2/branches/2.x/build.xml 2009-09-22 04:36:54 UTC (rev 5536) @@ -1749,7 +1749,7 @@ </copy> <copy file="${servlet.tests.dir}/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="6"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1765,8 +1765,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.callback"> @@ -1779,7 +1779,7 @@ </copy> <copy file="${servlet.tests.dir}/callback/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="6"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1795,8 +1795,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.contenttype"> @@ -1809,7 +1809,7 @@ </copy> <copy file="${servlet.tests.dir}/contenttype/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="10"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1825,8 +1825,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.marshal" depends="tests.servlet.config"> @@ -1839,7 +1839,7 @@ </copy> <copy file="${servlet.tests.dir}/marshal/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1855,8 +1855,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.marshal.config"> @@ -1869,7 +1869,7 @@ </copy> <copy file="${servlet.tests.dir}/marshal/config/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1885,8 +1885,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.marshal.noconfig"> @@ -1899,7 +1899,7 @@ </copy> <copy file="${servlet.tests.dir}/marshal/noconfig/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1915,8 +1915,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.mbeanserver.jboss"> @@ -1929,7 +1929,7 @@ </copy> <copy file="${servlet.tests.dir}/mbeanserver/jboss/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1945,8 +1945,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.mbeanserver.platform"> @@ -1963,7 +1963,7 @@ <!--param name="java.opts" value="-Djavax.management.builder.initial=org.jboss.system.server.jmx.MBeanServerBuilderImpl -Djboss.platform.mbeanserver -Dcom.sun.management.jmxremote"/--> <param name="java.opts" value=" -Djboss.platform.mbeanserver"/> </antcall> - <sleep seconds="4"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -1992,7 +1992,7 @@ </copy> <copy file="${servlet.tests.dir}/multihome/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -2008,8 +2008,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.nopreservelines"> @@ -2038,13 +2038,13 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.preservelines"> <copy file="${servlet.tests.dir}/preservelines/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <copy todir="${jboss.deploy.dir}"> <fileset dir="${output.lib.dir}"> <include name="servlet-invoker.war/**"/> @@ -2068,13 +2068,13 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.ssl"> <copy file="${servlet.tests.dir}/ssl/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/> - <sleep seconds="4"/> + <sleep seconds="8"/> <copy todir="${jboss.deploy.dir}"> <fileset dir="${output.lib.dir}"> <include name="servlet-invoker.war/**"/> @@ -2098,8 +2098,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.servlet.ssl.multihome"> @@ -2112,7 +2112,7 @@ </copy> <copy file="${servlet.tests.dir}/multihome/WEB-INF/web.xml" todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF" overwrite="true"/> - <sleep seconds="5"/> + <sleep seconds="8"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> @@ -2128,8 +2128,8 @@ </fileset> </batchtest> </junit> - <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/> - <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> + <delete dir="${jboss.deploy.dir}/servlet-invoker.war" failonerror="false"/> + <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml" failonerror="false"/> </target> <target name="tests.versioning.beta2.client" depends="jars, tests.jars">