You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2006/03/20 19:05:00 UTC
svn commit: r387266 - in /webservices/axis/trunk/c/src/configuration:
AxisConfiguration.cpp FileFunctions.cpp
Author: prestonf
Date: Mon Mar 20 10:04:58 2006
New Revision: 387266
URL: http://svn.apache.org/viewcvs?rev=387266&view=rev
Log:
Modification for Unix platforms.
Modified:
webservices/axis/trunk/c/src/configuration/AxisConfiguration.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=387266&r1=387265&r2=387266&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp Mon Mar 20 10:04:58 2006
@@ -27,6 +27,12 @@
LIST sFileNameList;
char * psDefaultParamList[eConfigMax];
+#if WIN32
+ sChoiceList[2].pszElement = "HTTPSSLChannel.dll";
+#else
+ sChoiceList[2].pszElement = "libhttp_channelssl.so";
+#endif
+
Initialise( &sDLLNames, iConfigInfoArray, &sFileNameList, (char **) psDefaultParamList);
switch( ReadConfigOptions( argc, argv, (char **) psDefaultParamList))
@@ -38,19 +44,18 @@
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 << "Client" << endl;
cout << "-a root directory of Axis download (AXISCPP_HOME)" << endl;
cout << "-o offset from AXISCPP_HOME to object files" << endl;
cout << "-th transport library name" << endl;
cout << "-c channel library name" << endl;
cout << "-cs ssl channel library name" << endl;
cout << "-x xerces library name" << endl;
+ cout << "Client Specific" << endl;
cout << "-cl client log filename" << endl;
cout << "-cw client WSDD filename" << endl;
- cout << "Server" << endl;
- cout << "" << endl;
- cout << "Both" << endl;
- cout << "" << endl;
+ cout << "Server Specific" << endl;
+ cout << "-sl server log filename" << endl;
+ cout << "-sw server WSDD filename" << endl;
break;
}
Modified: webservices/axis/trunk/c/src/configuration/FileFunctions.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/FileFunctions.cpp?rev=387266&r1=387265&r2=387266&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/FileFunctions.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/FileFunctions.cpp Mon Mar 20 10:04:58 2006
@@ -12,6 +12,7 @@
#else // Else !(MSVC verison number > 7.0)
long lFindFile;
#endif // End MSVC verison number
+
struct _finddata_t sFindData;
if( (lFindFile = _findfirst( pszDirName, &sFindData)) != -1)
@@ -36,19 +37,13 @@
struct dirent* pDirEnt;
int iFilenameCount = 0;
- cout << "pszDirName=" << pszDirName << endl;
-
if( (psDIR = opendir( pszDirName)) == NULL)
{
return bSuccess;
}
- cout << "2" << endl;
-
while( (pDirEnt = readdir( psDIR)) != NULL)
{
- cout << "pDirEnt->d_name=" << pDirEnt->d_name << endl;
-
AddFilenameToList( psFileNameList, pDirEnt->d_name);
}
@@ -77,7 +72,11 @@
char szFilename[512];
char szFileDirAndName[512];
+#if WIN32
sprintf( szFilename, "%s\\%s\\*.*", pszAxisCpp_Deploy, pszAxis_Bin);
+#else
+ sprintf( szFilename, "%s/%s/.", pszAxisCpp_Deploy, pszAxis_Bin);
+#endif
if( (bFound = ReadFilenamesInaDirectory( szFilename, psFileNameList)) == true)
{