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/27 18:25:07 UTC
svn commit: r389190 - in /webservices/axis/trunk/c/src/configuration:
AxisConfiguration.cpp AxisConfigurationLibraries.cpp
AxisConfigurationLibraries.hpp
Author: prestonf
Date: Mon Mar 27 08:25:05 2006
New Revision: 389190
URL: http://svn.apache.org/viewcvs?rev=389190&view=rev
Log:
change of code as the -cl option was not working.
Modified:
webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp
webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp
webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.hpp
Modified: webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp?rev=389190&r1=389189&r2=389190&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp Mon Mar 27 08:25:05 2006
@@ -9,12 +9,12 @@
{
LIST sDLLNames;
int iConfigInfoArray[eConfigMax];
- CHOICELIST sChoiceList[] = { {PLATFORM_TRANSPORTHTTP_PATH, "HTTP Transport library", AXCONF_TRANSPORTHTTP_TAGNAME, eHTTPTransport, eClientAndServer},
- {PLATFORM_CHANNEL_PATH, "HTTP Channel library", AXCONF_CHANNEL_HTTP_TAGNAME, eHTTPChannel, eClientAndServer},
+ CHOICELIST sChoiceList[] = { {PLATFORM_TRANSPORTHTTP_PATH, "HTTP Transport library", AXCONF_TRANSPORTHTTP_TAGNAME, eHTTPTransport, eClient},
+ {PLATFORM_CHANNEL_PATH, "HTTP Channel library", AXCONF_CHANNEL_HTTP_TAGNAME, eHTTPChannel, eClient},
#if WIN32
- {"HTTPSSLChannel.dll", "HTTP SSL Channel library", AXCONF_SSLCHANNEL_HTTP_TAGNAME, eHTTPSSLChannel, eClientAndServer},
+ {"HTTPSSLChannel.dll", "HTTP SSL Channel library", AXCONF_SSLCHANNEL_HTTP_TAGNAME, eHTTPSSLChannel, eClient},
#else
- {"libhttp_channelssl.so", "HTTP SSL Channel library", AXCONF_SSLCHANNEL_HTTP_TAGNAME, eHTTPSSLChannel, eClientAndServer},
+ {"libhttp_channelssl.so", "HTTP SSL Channel library", AXCONF_SSLCHANNEL_HTTP_TAGNAME, eHTTPSSLChannel, eClient},
#endif
{PLATFORM_XMLPARSER_PATH, "Axis XML Parser library", AXCONF_XMLPARSER_TAGNAME, eXMLParser, eClientAndServer},
{"SMTPTRANSPORT", "SMTP Transport library", AXCONF_TRANSPORTSMTP_TAGNAME, eSMTPTransport, eClientAndServer},
@@ -42,8 +42,7 @@
#endif
char szAxisCpp_Deploy[256];
-
- Initialise( &sDLLNames, iConfigInfoArray, &sFileNameList, (char **) psDefaultParamList);
+ Initialise( &sDLLNames, iConfigInfoArray, &sFileNameList, (char **) psDefaultParamList, szAxisCpp_Deploy, (int) sizeof( szAxisCpp_Deploy));
switch( ReadConfigOptions( argc, argv, (char **) psDefaultParamList, cSlash))
{
@@ -127,11 +126,19 @@
}
else
{
+ if( strlen( szAxisCpp_Deploy) > 0)
+ {
#if WIN32
- sprintf( szFilename, "%s\\%s", szAxisCpp_Deploy, szLog);
+ sprintf( szFilename, "%s\\%s", szAxisCpp_Deploy, szLog);
#else
- sprintf( szFilename, "%s/%s", szAxisCpp_Deploy, szLog);
+ sprintf( szFilename, "%s/%s", szAxisCpp_Deploy, szLog);
#endif
+ }
+ else
+ {
+ sprintf( szFilename, "%s", szLog);
+ }
+
iConfigInfoArray[sChoiceList[iChoiceCount].eConfigType] = PopulateNewDLLNameInfo( &sDLLNames, szLog, szFilename, true);
}
}
@@ -243,8 +250,12 @@
strcpy( ppsDefaultParamList[eBackup], "true");
strcpy( ppsDefaultParamList[eQueryMissingFiles], "on");
+cout << "iParamCount=" << iParamCount << endl;
+
for( int iCount = 0; iCount < iParamCount; iCount++)
{
+cout << iCount << "=[" << pParamArray[iCount] << "]"<< endl;
+
if( StringCompare( pParamArray[iCount], "Client"))
{
eConfig = (ECONFIG)((int) eConfig | eClient);
@@ -279,6 +290,7 @@
}
iCount++;
+cout << sOptions[iIndex].eConfType << "." << iCount << "=[" << pParamArray[iCount] << "]"<< endl;
if( iCount < iParamCount)
{
@@ -292,13 +304,17 @@
sOptions[iIndex].eConfType == eSSLOptions) &&
strchr( pParamArray[iCount], cSlash) == NULL)
{
- char szLocation[512];
+ std::string sLocation;
- sprintf( szLocation, "%s%c%s%c%s", ppsDefaultParamList[eRootDirectory], cSlash, ppsDefaultParamList[eOffsetToLibs], cSlash, pParamArray[iCount]);
+ sLocation = ppsDefaultParamList[eRootDirectory];
+ sLocation += cSlash;
+ sLocation += ppsDefaultParamList[eOffsetToLibs];
+ sLocation += cSlash;
+ sLocation += pParamArray[iCount];
- ppsDefaultParamList[sOptions[iIndex].eConfType] = (char *) malloc( strlen( szLocation) + 1);
+ ppsDefaultParamList[sOptions[iIndex].eConfType] = (char *) malloc( sLocation.length() + 1);
- strcpy( ppsDefaultParamList[sOptions[iIndex].eConfType], szLocation);
+ strcpy( ppsDefaultParamList[sOptions[iIndex].eConfType], sLocation.c_str());
}
else
{
Modified: webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp?rev=389190&r1=389189&r2=389190&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.cpp Mon Mar 27 08:25:05 2006
@@ -69,10 +69,11 @@
return pszTagValue;
}
-void Initialise( LIST * psDLLNames, int * piConfigInfoArray, LIST * psFileNameList, char ** ppsDefaultParamList)
+void Initialise( LIST * psDLLNames, int * piConfigInfoArray, LIST * psFileNameList, char ** ppsDefaultParamList, char * pszAxisCpp_Deploy, int iAxisCpp_Deploy)
{
memset( psDLLNames, 0, sizeof( LIST));
memset( psFileNameList, 0, sizeof( LIST));
+ memset( pszAxisCpp_Deploy, 0, iAxisCpp_Deploy);
for( int iCount = 0; iCount < eConfigMax; iCount++)
{
Modified: webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.hpp?rev=389190&r1=389189&r2=389190&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.hpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfigurationLibraries.hpp Mon Mar 27 08:25:05 2006
@@ -1,7 +1,7 @@
#include "AxisConfiguration.hpp"
char * CreateConfigElement( LIST * psDLLNames, int * piConfigInfoArray, CHOICELIST * psChoiceList, ECONFIGTYPE eConfigType);
-void Initialise( LIST * psDLLNames, int * piConfigInfoArray, LIST * psFileNameList, char ** ppsDefaultParamList);
+void Initialise( LIST * psDLLNames, int * piConfigInfoArray, LIST * psFileNameList, char ** ppsDefaultParamList, char * pszAxisCpp_Deploy, int iAxisCpp_Deploy);
void Destroy( LIST * psDLLNames, LIST * psFileNameList, char ** psDefaultParamList);
int PopulateNewDLLNameInfo( LIST * psDLLNames, char * pszName, char * pszFilename, bool bAddToClientConfig);
char * GetTagValue( LIST * psDLLNames, int * piConfigInfoArray, ECONFIGTYPE eConfigType);