axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prest...@apache.org
Subject svn commit: r389092 - in /webservices/axis/trunk/c/src/configuration: AxisConfiguration.cpp AxisConfiguration.hpp AxisConfigurationLibraries.cpp FileFunctions.cpp Instructions.cpp Instructions.hpp
Date Mon, 27 Mar 2006 10:27:35 GMT
Author: prestonf
Date: Mon Mar 27 02:27:33 2006
New Revision: 389092

URL: http://svn.apache.org/viewcvs?rev=389092&view=rev
Log:
Updated and removed instructions to a separate file.

Added:
    webservices/axis/trunk/c/src/configuration/Instructions.cpp
    webservices/axis/trunk/c/src/configuration/Instructions.hpp
Modified:
    webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp
    webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp
    webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp
    webservices/axis/trunk/c/src/configuration/FileFunctions.cpp

Modified: webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp?rev=389092&r1=389091&r2=389092&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp Mon Mar 27 02:27:33 2006
@@ -47,146 +47,7 @@
 	{
 		case eEmpty:
 		{
-			cout << "Usage:" << endl;
-			cout << "AxisConfiguration Client [params1]\tConfigure the client side." <<
endl;
-			cout << "AxisConfiguration Server [params2]\tConfigure the server side." <<
endl;
-			cout << "AxisConfiguration Both [params3]\tConfigure the client and server side."
<< endl << endl;
-			cout << "The param list is as follows:-" << endl;
-			cout << "-acd directory to write axiscpp.conf once it has been configured." <<
endl <<
-				    "     This overrides the -a value." << endl;
-#if WIN32
-			cout << "     example: -acd c:\\Axis\\Different" << endl;
-#else
-			cout << "     example: -a /home/userid/Axis/Different" << endl;
-#endif
-			cout << "-a   root directory of Axis download (AXISCPP_HOME)" << endl;
-#if WIN32
-			cout << "     example: -a c:\\Axis" << endl;
-#else
-			cout << "     example: -a /home/userid/Axis" << endl;
-#endif
-			cout << "-o   directory offset from AXISCPP_HOME to object files" << endl;
-#if WIN32
-			cout << "     example: -o " << pszPackageName << endl;
-#else
-			cout << "     example: -o " << pszPackageName << endl;
-#endif
-			cout << "-th  transport library name" << endl;
-			cout << "     if -a and -o have both already been defined, then only the" <<
endl;
-			cout << "     filename is required.  Otherwise the fully qualified path will" <<
endl;
-			cout << "     be required (NB: You can still override the -a and -o definitions"
<< endl;
-			cout << "     by using a fully qulified path)." << endl;
-			cout << "     example (with -a and -o defined): " << endl;
-#if WIN32
-			cout << "     -th HTTPTransport.dll" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -th c:\\Axis\\" << pszPackageName << "\\HTTPTransport.dll"
<< endl;
-#else
-			cout << "     -th libhttp_transport.so" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -th /home/userid/Axis/" << pszPackageName << "/libhttp_transport.so"
<< endl;
-#endif
-			cout << "-c   channel library name" << endl;
-			cout << "     if -a and -o have both already been defined, then only the" <<
endl;
-			cout << "     filename is required.  Otherwise the fully qualified path will" <<
endl;
-			cout << "     be required (NB: You can still override the -a and -o definitions"
<< endl;
-			cout << "     by using a fully qulified path)." << endl;
-			cout << "     example (with -a and -o defined): " << endl;
-#if WIN32
-			cout << "     -c HTTPChannel.dll" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -c c:\\Axis\\" << pszPackageName << "\\HTTPChannel.dll"
<< endl;
-#else
-			cout << "     -c libhttp_channel.so" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -c /home/userid/Axis/" << pszPackageName << "/libhttp_channel.so"
<< endl;
-#endif
-			cout << "-cs  ssl channel library name" << endl;
-			cout << "     if -a and -o have both already been defined, then only the" <<
endl;
-			cout << "     filename is required.  Otherwise the fully qualified path will" <<
endl;
-			cout << "     be required (NB: You can still override the -a and -o definitions"
<< endl;
-			cout << "     by using a fully qulified path)." << endl;
-			cout << "     example (with -a and -o defined): " << endl;
-#if WIN32
-			cout << "     -cs HTTPSSLChannel.dll" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -cs c:\\Axis\\" << pszPackageName << "\\HTTPSSLChannel.dll"
<< endl;
-#else
-			cout << "     -cs libhttp_channelssl.so" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -cs /home/userid/Axis/" << pszPackageName << "/libhttp_channelssl.so"
<< endl;
-#endif
-			cout << "-x   xerces library name" << endl;
-			cout << "     if -a and -o have both already been defined, then only the" <<
endl;
-			cout << "     filename is required.  Otherwise the fully qualified path will" <<
endl;
-			cout << "     be required (NB: You can still override the -a and -o definitions"
<< endl;
-			cout << "     by using a fully qulified path)." << endl;
-			cout << "     example (with -a and -o defined): " << endl;
-#if WIN32
-			cout << "     -x AxisXMLParserXerces.dll" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -x c:\\Axis\\" << pszPackageName << "\\AxisXMLParserXerces.dll"
<< endl;
-#else
-			cout << "     -x libaxis_xerces.so" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-			cout << "     -x /home/userid/Axis/" << pszPackageName << "/libaxis_xerces.so"
<< endl;
-#endif
-			cout << "-m   merge with existing configuration file" << endl;
-			cout << "     example: -m on|off (the default is 'off' meaning 'overwrite')" <<
endl;
-			cout << "Client Specific" << endl;
-			cout << "-cl  client log filename" << endl;
-			cout << "     if -a has been defined, then only the filename is required." <<
endl;
-			cout << "     Otherwise the fully qualified path will be required." << endl;
-			cout << "     (NB: You can still override the -a and -o definitions by using" <<
endl;
-			cout << "     a fully qulified path).  To ignore the client log, using 'ignore'"
<< endl;
-			cout << "     instead of a filename.  Example (with -a defined): " << endl;
-			cout << "     -cl client.log" << endl;
-			cout << "     example (without -a defined): " << endl;
-#if WIN32
-			cout << "     -cl c:\\Axis\\client.log" << endl;
-#else
-			cout << "     -cl /home/userid/Axis/client.log" << endl;
-#endif
-			cout << "-cw  client WSDD filename" << endl;
-			cout << "     if -a and -o have both already been defined, then only the" <<
endl;
-			cout << "     filename is required.  Otherwise the fully qualified path will" <<
endl;
-			cout << "     be required (NB: You can still override the -a and -o definitions"
<< endl;
-			cout << "     by using a fully qulified path)." << endl;
-			cout << "     example (with -a and -o defined): " << endl;
-			cout << "     -cw client.wsdd" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-#if WIN32
-			cout << "     -cw c:\\Axis\\WSDD\\client.wsdd" << endl;
-#else
-			cout << "     -cw /home/userid/Axis/WSDD/client.wsdd" << endl;
-#endif
-			cout << "Server Specific" << endl;
-			cout << "-sl  server log filename" << endl;
-			cout << "     if -a has been defined, then only the filename is required." <<
endl;
-			cout << "     Otherwise the fully qualified path will be required." << endl;
-			cout << "     (NB: You can still override the -a and -o definitions by using" <<
endl;
-			cout << "     a fully qulified path)." << endl;
-			cout << "     example (with -a defined): " << endl;
-			cout << "     -sl server.log" << endl;
-			cout << "     example (without -a defined): " << endl;
-#if WIN32
-			cout << "     -sl c:\\Axis\\server.log" << endl;
-#else
-			cout << "     -sl /home/userid/Axis/server.log" << endl;
-#endif
-			cout << "-sw  server WSDD filename" << endl;
-			cout << "     if -a and -o have both already been defined, then only the" <<
endl;
-			cout << "     filename is required.  Otherwise the fully qualified path will" <<
endl;
-			cout << "     be required (NB: You can still override the -a and -o definitions"
<< endl;
-			cout << "     by using a fully qulified path)." << endl;
-			cout << "     example (with -a and -o defined): " << endl;
-			cout << "     -sw server.wsdd" << endl;
-			cout << "     example (without -a and -o defined): " << endl;
-#if WIN32
-			cout << "     -sw c:\\Axis\\WSDD\\server.wsdd" << endl;
-#else
-			cout << "     -sw /home/userid/Axis/WSDD/server.wsdd" << endl;
-#endif
+			Instructions( pszPackageName);
 			break;
 		}
 

Modified: webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp?rev=389092&r1=389091&r2=389092&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp Mon Mar 27 02:27:33 2006
@@ -8,6 +8,7 @@
 #include "platforms/PlatformAutoSense.hpp"
 #include "common/AxisConfig.h"
 #include "ListMethods.hpp"
+#include "Instructions.hpp"
 
 using namespace std;
 

Modified: webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp?rev=389092&r1=389091&r2=389092&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp Mon Mar 27 02:27:33
2006
@@ -107,6 +107,8 @@
 			free( (void *) ppsDefaultParamList[iCount]);
 		}
 	}
+
+	fcloseall();
 }
 
 int PopulateNewDLLNameInfo( LIST * psDLLNames, char * pszName, char * pszFilename, bool bAddToClientConfig)

Modified: webservices/axis/trunk/c/src/configuration/FileFunctions.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/FileFunctions.cpp?rev=389092&r1=389091&r2=389092&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/FileFunctions.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/FileFunctions.cpp Mon Mar 27 02:27:33 2006
@@ -146,8 +146,8 @@
 
 	if( bMerge)
 	{
-		char *		pszData = NULL;
-		long		lFileLength = 0;
+		char *	pszData = NULL;
+		long	lFileLength = 0;
 		
 		if( (lFileLength = ReadFileContents( szFilename, &pszData)) > -1)
 		{
@@ -155,7 +155,7 @@
 
 			if( lFileLength < 5)
 			{
-				char		szConfigData[512];
+				char	szConfigData[512];
 
 				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", TimeNow());
 
@@ -169,7 +169,7 @@
 
 			for( int ieConfigType = eHTTPTransport; ieConfigType < eConfigMax; ieConfigType++)
 			{
-				int		iChoiceIndex = GetChoiceIndexForConfigType( psChoiceList, (ECONFIGTYPE) ieConfigType);
+				int	iChoiceIndex = GetChoiceIndexForConfigType( psChoiceList, (ECONFIGTYPE) ieConfigType);
 
 				if( iChoiceIndex != -1)
 				{
@@ -185,9 +185,9 @@
 							psTagLineStart++;
 
 							while( *psTagLineEnd != '\n' &&
-								*psTagLineEnd != '\r' &&
-								*psTagLineEnd != '\0' &&
-								psTagLineEnd - pszData < lFileLength)
+								   *psTagLineEnd != '\r' &&
+								   *psTagLineEnd != '\0' &&
+								   psTagLineEnd - pszData < lFileLength)
 							{
 								psTagLineEnd++;
 							}
@@ -333,9 +333,22 @@
 			fclose( pFileFrom);
 			fclose( pFileTo);
 
+			pFileTo = NULL;
+			pFileFrom = NULL;
+
 			free( pFileContent);
 
 			bSuccess = true;
+		}
+
+		if( pFileTo != NULL)
+		{
+			fclose( pFileTo);
+		}
+
+		if( pFileFrom != NULL)
+		{
+			fclose( pFileFrom);
 		}
 	}
 

Added: webservices/axis/trunk/c/src/configuration/Instructions.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/Instructions.cpp?rev=389092&view=auto
==============================================================================
--- webservices/axis/trunk/c/src/configuration/Instructions.cpp (added)
+++ webservices/axis/trunk/c/src/configuration/Instructions.cpp Mon Mar 27 02:27:33 2006
@@ -0,0 +1,171 @@
+#include "Instructions.hpp"
+
+void Instructions( char * pszPackageName)
+{
+
+	cout << "Usage" << endl <<
+			"-----" << endl << endl;
+
+	cout << "AxisConfiguration Client [params1]\tConfigure the client side." <<
endl;
+	cout << "AxisConfiguration Server [params2]\tConfigure the server side." <<
endl;
+	cout << "AxisConfiguration Both [params3]\tConfigure the client and server side."
<< endl << endl;
+	cout << "The param list is as follows:-" << endl;
+	cout << "-acd directory to write axiscpp.conf once it has been configured.  This"
<< endl <<
+			"     overrides the '-a' value (which defines where axiscpp.conf would normally" <<
endl <<
+			"     reside)." << endl <<
+#if WIN32
+			"     example: -acd c:\\Axis\\Different" << endl << endl;
+#else
+			"     example: -a /home/userid/Axis/Different" << endl << endl;
+#endif
+	cout << "-a   root directory of Axis download (AXISCPP_HOME)" << endl <<
+#if WIN32
+			"     example: -a c:\\Axis" << endl << endl;
+#else
+			"     example: -a /home/userid/Axis" << endl << endl;
+#endif
+	cout << "-o   directory offset from AXISCPP_HOME to object files" <<
+#if WIN32
+			"     example: -o " << pszPackageName << endl << endl;
+#else
+			"     example: -o " << pszPackageName << endl << endl;
+#endif
+	cout << "-th  transport library name" << endl <<
+			"     if -a and -o have both already been defined, then only the filename is" <<
endl <<
+			"     required.  Otherwise the fully qualified path will be required (NB: You" <<
endl <<
+			"     can still override the -a and -o definitions by using a fully qulified" <<
endl <<
+			"     path)." << endl <<
+			"     example (with -a and -o defined): " << endl <<
+#if WIN32
+			"     -th HTTPTransport.dll" << endl << endl <<
+			"     example (without -a and -o defined): " << endl <<
+			"     -th c:\\Axis\\" << pszPackageName << "\\HTTPTransport.dll" <<
endl << endl;
+#else
+			"     -th libhttp_transport.so" << endl <<
+			"     example (without -a and -o defined): " << endl <<
+			"     -th /home/userid/Axis/" << pszPackageName << "/libhttp_transport.so"
<< endl << endl;
+#endif
+	cout << "-c   channel library name" << endl <<
+			"     if -a and -o have both already been defined, then only the filename is" <<
endl <<
+			"     required.  Otherwise the fully qualified path will be required (NB: You" <<
endl <<
+			"     can still override the -a and -o definitions by using a fully qulified" <<
endl <<
+			"     path)." << endl <<
+			"     example (with -a and -o defined): " << endl <<
+#if WIN32
+			"     -c HTTPChannel.dll" << endl <<
+			"     example (without -a and -o defined):" << endl <<
+			"     -c c:\\Axis\\" << pszPackageName << "\\HTTPChannel.dll" << endl
<< endl;
+#else
+			"     -c libhttp_channel.so" << endl;
+			"     example (without -a and -o defined):" << endl;
+			"     -c /home/userid/Axis/" << pszPackageName << "/libhttp_channel.so" <<
endl << endl;
+#endif
+	cout << "-cs  ssl channel library name" << endl <<
+			"     if -a and -o have both already been defined, then only the filename is" <<
endl <<
+			"     required.  Otherwise the fully qualified path will be required (NB: You" <<
endl <<
+			"     can still override the -a and -o definitions by using a fully qulified" <<
endl <<
+			"     path)." << endl <<
+			"     example (with -a and -o defined):" << endl <<
+#if WIN32
+			"     -cs HTTPSSLChannel.dll" << endl << endl <<
+			"     example (without -a and -o defined):" << endl <<
+			"     -cs c:\\Axis\\" << pszPackageName << "\\HTTPSSLChannel.dll" <<
endl << endl;
+#else
+			"     -cs libhttp_channelssl.so" << endl << endl <<
+			"     example (without -a and -o defined):" << endl <<
+			"     -cs /home/userid/Axis/" << pszPackageName << "/libhttp_channelssl.so"
<< endl << endl;
+#endif
+	cout << "-x   xerces library name" << endl <<
+			"     if -a and -o have both already been defined, then only the filename is" <<
endl <<
+			"     required.  Otherwise the fully qualified path will be required (NB: You" <<
endl <<
+			"     can still override the -a and -o definitions by using a fully qulified" <<
endl <<
+			"     path)." << endl <<
+			"     example (with -a and -o defined):" << endl <<
+#if WIN32
+			"     -x AxisXMLParserXerces.dll" << endl << endl <<
+			"     example (without -a and -o defined):" << endl <<
+			"     -x c:\\Axis\\" << pszPackageName << "\\AxisXMLParserXerces.dll" <<
endl << endl;
+#else
+			"     -x libaxis_xerces.so" << endl << endl <<
+			"     example (without -a and -o defined):" << endl <<
+			"     -x /home/userid/Axis/" << pszPackageName << "/libaxis_xerces.so" <<
endl << endl;
+#endif
+	cout << "-m   merge with existing configuration file" << endl <<
+			"     example: -m on|off (the default is 'off' meaning 'overwrite')" << endl <<
endl;
+
+	cout << "-pi  change the progress information output during the construction of the"
<< endl <<
+			"     configuration file." << endl <<
+			"     example: -pi normal|quiet (the default is 'normal' meaning \"give full" <<
endl <<
+			"     descriptions\")." << endl << endl;
+
+	cout << "-b   backup the existing configuration file before creating the new one."
<< endl <<
+			"     example: -b true|false (the default is 'true')." << endl << endl;
+
+	cout << "-qmf query for missing files." << endl <<
+			"     When no parameter for a filename is provided on the command line, the" <<
endl <<
+			"     application will list the file options and the user then selects which" <<
endl <<
+			"     file to use in the configuration file.  This can be turned off using this" <<
endl <<
+			"     parameter." << endl <<
+			"     example: -qmf on|off (the default is 'on' meaning \"list and then ask for" <<
endl <<
+			"                           file to include\")." << endl << endl;
+     
+	cout << "-so  SSL options." << endl <<
+			"     Used to add a string of parameters (if) required by the version SSL." << endl
<<
+			"     example: -so \"...parameter list...\"" << endl << endl;
+
+	cout << "Client Specific" << endl <<
+			"---------------" << endl;
+	cout << "-cl  client log filename" << endl <<
+			"     if -a has been defined, then only the filename is required.  Otherwise the" <<
endl <<
+			"     fully qualified path will be required.  (NB: You can still override the -a" <<
endl <<
+			"     and -o definitions by using a fully qulified path).  To ignore the client" <<
endl <<
+			"     log, using 'ignore' instead of a filename." << endl <<
+			"     -cl client.log" << endl << endl <<
+			"     example (without -a defined): " << endl <<
+#if WIN32
+			"     -cl c:\\Axis\\client.log" << endl << endl;
+#else
+			"     -cl /home/userid/Axis/client.log" << endl << endl;
+#endif
+	cout << "-cw  client WSDD filename" << endl <<
+			"     if -a and -o have both already been defined, then only the filename is" <<
endl <<
+			"     required.  Otherwise the fully qualified path will be required (NB: You" <<
endl <<
+			"     can still override the -a and -o definitions by using a fully qulified" <<
endl <<
+			"     path)." << endl <<
+			"     example (with -a and -o defined):" << endl <<
+			"     -cw client.wsdd" << endl << endl <<
+			"     example (without -a and -o defined):" << endl <<
+#if WIN32
+			"     -cw c:\\Axis\\WSDD\\client.wsdd" << endl << endl;
+#else
+			"     -cw /home/userid/Axis/WSDD/client.wsdd" << endl << endl;
+#endif
+	cout << "Server Specific" << endl <<
+			"---------------" << endl;
+
+	cout << "-sl  server log filename" << endl <<
+			"     if -a has been defined, then only the filename is required.  Otherwise the" <<
endl <<
+			"     fully qualified path will be required.  (NB: You can still override the -a" <<
endl <<
+			"     and -o definitions by using a fully qulified path)." << endl <<
+			"     example (with -a defined):" << endl <<
+			"     -sl server.log" << endl << endl <<
+			"     example (without -a defined):" << endl <<
+#if WIN32
+			"     -sl c:\\Axis\\server.log" << endl << endl;
+#else
+			"     -sl /home/userid/Axis/server.log" << endl << endl;
+#endif
+	cout << "-sw  server WSDD filename" << endl <<
+			"     if -a and -o have both already been defined, then only the filename is" <<
endl <<
+			"     required.  Otherwise the fully qualified path will be required (NB: You" <<
endl <<
+			"     can still override the -a and -o definitions by using a fully qulified" <<
endl <<
+			"     path)." << endl <<
+			"     example (with -a and -o defined):" << endl <<
+			"     -sw server.wsdd" << endl << endl <<
+			"     example (without -a and -o defined):" << endl <<
+#if WIN32
+			"     -sw c:\\Axis\\WSDD\\server.wsdd" << endl << endl;
+#else
+			"     -sw /home/userid/Axis/WSDD/server.wsdd" << endl << endl;
+#endif
+}

Added: webservices/axis/trunk/c/src/configuration/Instructions.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/Instructions.hpp?rev=389092&view=auto
==============================================================================
--- webservices/axis/trunk/c/src/configuration/Instructions.hpp (added)
+++ webservices/axis/trunk/c/src/configuration/Instructions.hpp Mon Mar 27 02:27:33 2006
@@ -0,0 +1,5 @@
+#include <iostream>
+
+using namespace std;
+
+void Instructions( char * pszPackageName);



Mime
View raw message