Author: ropalka Date: 2012-02-27 09:15:17 -0500 (Mon, 27 Feb 2012) New Revision: 15760 Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15749,15759 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15749 | ropalka | 2012-02-27 10:25:03 +0100 (Mon, 27 Feb 2012) | 1 line sync. with AS7 upstream ....... r15759 | ropalka | 2012-02-27 15:09:19 +0100 (Mon, 27 Feb 2012) | 1 line [JBWS-3435] update bin distro to be able to execute appclient tests too ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759 Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-27 14:09:19 UTC (rev 15759) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-27 14:15:17 UTC (rev 15760) @@ -104,6 +104,7 @@ <include>java/org/jboss/test/ws/jaxrpc/samples/**</include> <include>java/org/jboss/test/ws/jaxws/samples/**</include> <include>java/org/jboss/test/ws/jaxws/smoke/**</include> + <include>java/org/jboss/test/ws/appclient/**</include> <include>java/org/jboss/test/ws/management/**</include> <include>java/org/jboss/test/ws/projectGenerator/**</include> <include>java/org/jboss/test/ws/saaj/**</include> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-02-27 14:09:19 UTC (rev 15759) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-02-27 14:15:17 UTC (rev 15760) @@ -1,52 +0,0 @@ -/* - * 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); - } - -} Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java (from rev 15759, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-02-27 14:15:17 UTC (rev 15760) @@ -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); + } + +} Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-27 14:09:19 UTC (rev 15759) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-27 14:15:17 UTC (rev 15760) @@ -1065,7 +1065,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.2.Final</version> + <version>1.0.3.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1110,13 +1110,13 @@ <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.0.Final</version> + <version>1.0.1.Final</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.2.1.GA</version> + <version>3.2.2.GA</version> <scope>test</scope> </dependency> </dependencies>