Author: ropalka Date: 2012-02-27 08:36:44 -0500 (Mon, 27 Feb 2012) New Revision: 15756 Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml Log: [JBWS-3435] moving AppclientKiller to test sources Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-27 13:34:36 UTC (rev 15755) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-27 13:36:44 UTC (rev 15756) @@ -427,10 +427,10 @@ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> <manifest> - <attribute name="main-class" value="org.jboss.ws.common.appclient.AppclientKiller"/> - <attribute name="Dependencies" value="org.jboss.ws.common"/> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF"> <include name="application-client.xml"/> @@ -463,10 +463,10 @@ <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> <manifest> - <attribute name="main-class" value="org.jboss.ws.common.appclient.AppclientKiller"/> - <attribute name="Dependencies" value="org.jboss.ws.common"/> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF"> <include name="application-client.xml"/> Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2012-02-27 13:34:36 UTC (rev 15755) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2012-02-27 13:36:44 UTC (rev 15756) @@ -286,11 +286,11 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.ws.common.appclient.AppclientKiller"/> - <attribute name="Dependencies" value="org.jboss.ws.common"/> - </manifest> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> + </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> <include name="application-client.xml"/> <include name="wsdl/**"/> Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-02-27 13:36:44 UTC (rev 15756) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.ws.appclient; + +import java.io.File; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class AppclientKiller +{ + + private final static int MAX_COUNT_OF_ATTEMTS = 600; + + public static void main(final String[] args) throws Exception { + if (args.length != 1) { + throw new RuntimeException("shutdown mark file name missing"); + } + final File shutdownMarkFile = new File(args[0]); + int countOfAttempts = 0; + while (!shutdownMarkFile.exists()) { + countOfAttempts++; + Thread.sleep(100); + if (countOfAttempts == MAX_COUNT_OF_ATTEMTS) { + System.out.println("appclient timeout"); + break; + } + } + System.exit(1); + } + +}