axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject svn commit: r443330 - in /webservices/axis/trunk/c: services.xml src/client/adminclient/AdminClient.cpp
Date Thu, 14 Sep 2006 12:31:54 GMT
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


Mime
View raw message