Return-Path: 
 <axis-cvs-return-17538-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 24983 invoked from network); 14 Sep 2006 12:34:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Sep 2006 12:34:08 -0000
Received: (qmail 24440 invoked by uid 500); 14 Sep 2006 12:34:06 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 24326 invoked by uid 500); 14 Sep 2006 12:34:06 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 24315 invoked by uid 99); 14 Sep 2006 12:34:06 -0000
Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org)
 (140.211.166.84)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Sep 2006 05:34:06 -0700
Authentication-Results: idunn.apache.osuosl.org smtp.mail=hawkeye@apache.org;
 spf=permerror
X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME
Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from
 140.211.166.113 cause and error)
Received: from ([140.211.166.113:54091] helo=eris.apache.org)
	by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP
	id 07/B1-04605-CBB49054 for <axis-cvs@ws.apache.org>;
 Thu, 14 Sep 2006 05:33:11 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 45D4E1A981A; Thu, 14 Sep 2006 05:31:54 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r443330 - in /webservices/axis/trunk/c: services.xml
 src/client/adminclient/AdminClient.cpp
Date: Thu, 14 Sep 2006 12:31:54 -0000
To: axis-cvs@ws.apache.org
From: hawkeye@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060914123154.45D4E1A981A@eris.apache.org>
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: hawkeye
Date: Thu Sep 14 05:31:53 2006
New Revision: 443330

URL: http://svn.apache.org/viewvc?view=rev&rev=443330
Log:
Admin client now has optional timeout value. This is used in the services.xml when we are stopping any already started servers as it used to hang on unix if there were no servers.

Modified:
    webservices/axis/trunk/c/services.xml
    webservices/axis/trunk/c/src/client/adminclient/AdminClient.cpp

Modified: webservices/axis/trunk/c/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/services.xml?view=diff&rev=443330&r1=443329&r2=443330
==============================================================================
--- webservices/axis/trunk/c/services.xml (original)
+++ webservices/axis/trunk/c/services.xml Thu Sep 14 05:31:53 2006
@@ -460,7 +460,7 @@
     <target name="stopAxisServer" depends="initialize">
         <exec executable="${dir.release}/bin/${adminClientExecutableName}${executableSuffix}"
             failifexecutionfails="true">
-            <arg line="localhost ${testPort} STOP" />
+            <arg line="localhost ${testPort} STOP 120" />
             <env key="PATH"
                 path="${dir.xmlParser}/bin${path.separator}${dir.libraries}${path.separator}${java.library.path}" />
             <env key="LD_LIBRARY_PATH"

Modified: webservices/axis/trunk/c/src/client/adminclient/AdminClient.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/client/adminclient/AdminClient.cpp?view=diff&rev=443330&r1=443329&r2=443330
==============================================================================
--- webservices/axis/trunk/c/src/client/adminclient/AdminClient.cpp (original)
+++ webservices/axis/trunk/c/src/client/adminclient/AdminClient.cpp Thu Sep 14 05:31:53 2006
@@ -34,8 +34,7 @@
 
     if( argc < 4)
     {
-        printf( "Usage: %s <server> <port> <wsdd file>\n", argv[0]);
-        printf( "Usage: %s <server> <port> STOP\n", argv[0]);
+        printf( "Usage: %s [server] [port] [wsdd file | STOP] <time to wait>\n", argv[0]);
         exit( 1);
     }
 
@@ -47,6 +46,13 @@
     try
     {
         axiscpp::AxisAdminService   ws( Uri.c_str());
+        
+        if(argc==5)
+        {
+            // set the timeout or else on linux it'll sit there forever.
+            ws.setTransportTimeout(atoi(argv[4]));
+        }
+        
 		if ( 0 == strcmp(argv[3], "STOP") )
 		{
             if( axiscpp::true_ == ws.stopAxis())



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org