You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2006/03/24 13:41:24 UTC
svn commit: r388501 - in /webservices/axis/trunk/c: build/executeTest.xml
src/configuration/AxisConfiguration.cpp
src/configuration/AxisConfiguration.hpp
Author: prestonf
Date: Fri Mar 24 04:41:23 2006
New Revision: 388501
URL: http://svn.apache.org/viewcvs?rev=388501&view=rev
Log:
Modifications made to executeTest.xml so that it now only includes those files that are requested into the axiscpp.conf file. Updated AxisConfiguration to handle an additional flag that will only set the what ever is passed in the parameter list in the configuration file without asking about other files that are not specified.
Modified:
webservices/axis/trunk/c/build/executeTest.xml
webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp
webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp
Modified: webservices/axis/trunk/c/build/executeTest.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/executeTest.xml?rev=388501&r1=388500&r2=388501&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/executeTest.xml (original)
+++ webservices/axis/trunk/c/build/executeTest.xml Fri Mar 24 04:41:23 2006
@@ -316,18 +316,106 @@
<istrue value="${testconf.client.parser.xerces}"/>
</condition>
- <exec dir="${dir.libraries}" executable="${axisConfigurationExecutableName}${executableSuffix}">
- <arg line="Client -acd ${confFileDirectory}
- -th ${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
- -c ${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
- -cs ${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
- -x ${dir.libraries}/${ClientParserLib}
- -cl ignore
- -so ${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false
- -b false
- -v quiet"
- />
- </exec>
+ <if>
+ <and>
+ <not>
+ <isset property="test.notrace"/>
+ </not>
+ <not>
+ <istrue value="${test.ssl}"/>
+ </not>
+ </and>
+ <then>
+
+<!-- No Client Log, No SSL Library -->
+ <echo message="No Client log or SSL library."/>
+ <exec dir="${dir.libraries}" executable="${axisConfigurationExecutableName}${executableSuffix}">
+ <arg line="Client -acd ${confFileDirectory}
+ -th ${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
+ -c ${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
+ -x ${dir.libraries}/${ClientParserLib}
+ -so ${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false
+ -b false
+ -pi quiet
+ -qmf off"
+ />
+ </exec>
+ </then>
+ </if>
+
+ <if>
+ <and>
+ <not>
+ <istrue value="${test.ssl}"/>
+ </not>
+ <isset property="test.notrace"/>
+ </and>
+ <then>
+<!-- Client Log, No SSL Library -->
+ <echo message="Client log, but no SSL library."/>
+ <exec dir="${dir.libraries}" executable="${axisConfigurationExecutableName}${executableSuffix}">
+ <arg line="Client -acd ${confFileDirectory}
+ -th ${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
+ -c ${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
+ -x ${dir.libraries}/${ClientParserLib}
+ -cl ${test.directory}/ClientLog.taw
+ -so ${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false
+ -b false
+ -pi quiet
+ -qmf off"
+ />
+ </exec>
+ </then>
+ </if>
+
+ <if>
+ <and>
+ <not>
+ <isset property="test.notrace"/>
+ </not>
+ <istrue value="${test.ssl}"/>
+ </and>
+ <then>
+<!-- No Client Log, SSL Library -->
+ <echo message="No Client log but SSL library."/>
+ <exec dir="${dir.libraries}" executable="${axisConfigurationExecutableName}${executableSuffix}">
+ <arg line="Client -acd ${confFileDirectory}
+ -th ${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
+ -c ${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
+ -cs ${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
+ -x ${dir.libraries}/${ClientParserLib}
+ -so ${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false
+ -b false
+ -pi quiet
+ -qmf off"
+ />
+ </exec>
+ </then>
+ </if>
+
+ <if>
+ <and>
+ <isset property="test.notrace"/>
+ <istrue value="${test.ssl}"/>
+ </and>
+ <then>
+<!-- Client Log, SSL Library -->
+ <echo message="Client log and SSL library."/>
+ <exec dir="${dir.libraries}" executable="${axisConfigurationExecutableName}${executableSuffix}">
+ <arg line="Client -acd ${confFileDirectory}
+ -th ${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
+ -c ${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
+ -cs ${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
+ -x ${dir.libraries}/${ClientParserLib}
+ -cl ${test.directory}/ClientLog.taw
+ -so ${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false
+ -b false
+ -pi quiet
+ -qmf off"
+ />
+ </exec>
+ </then>
+ </if>
</target>
<target name="createConfigurationFileOld" depends="checkIfDebug" if="successfulClientCompilation">
Modified: webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp?rev=388501&r1=388500&r2=388501&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfiguration.cpp Fri Mar 24 04:41:23 2006
@@ -52,133 +52,140 @@
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 << "-a root directory of Axis download (AXISCPP_HOME)" << endl;
+ cout << "-acd directory to write axiscpp.conf once it has been configured." << endl <<
+ " This overrides the -a value." << endl;
#if WIN32
- cout << " example: -a c:\\Axis" << endl;
+ cout << " example: -acd c:\\Axis\\Different" << endl;
#else
- cout << " example: -a /home/userid/Axis" << endl;
+ cout << " example: -a /home/userid/Axis/Different" << endl;
#endif
- cout << "-o directory offset from AXISCPP_HOME to object files" << endl;
+ cout << "-a root directory of Axis download (AXISCPP_HOME)" << 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;
+ 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 << "-m merge with existing configuration file" << endl;
- cout << " example: -m on|off (the default is 'off' meaning 'overwrite')" << endl;
+ 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;
+ 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;
+ cout << " -cw c:\\Axis\\WSDD\\client.wsdd" << endl;
#else
- cout << " -cw /home/userid/Axis/WSDD/client.wsdd" << endl;
+ 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;
+ 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;
+ cout << " -sw c:\\Axis\\WSDD\\server.wsdd" << endl;
#else
- cout << " -sw /home/userid/Axis/WSDD/server.wsdd" << endl;
+ cout << " -sw /home/userid/Axis/WSDD/server.wsdd" << endl;
#endif
break;
}
@@ -199,8 +206,9 @@
{
if( sChoiceList[iChoiceCount].eConfig & eClient)
{
- if( sChoiceList[iChoiceCount].eConfigType == eClientLog ||
- sChoiceList[iChoiceCount].eConfigType == eServerLog)
+ if( (sChoiceList[iChoiceCount].eConfigType == eClientLog ||
+ sChoiceList[iChoiceCount].eConfigType == eServerLog) &&
+ StringCompare( psDefaultParamList[eQueryMissingFiles], "ON"))
{
char szLog[256];
@@ -318,30 +326,33 @@
ECONFIG ReadConfigOptions( int iParamCount, char * pParamArray[], char ** ppsDefaultParamList, char cSlash)
{
ECONFIG eConfig = eEmpty;
- OPTIONLIST sOptions[] = {{eHTTPTransport, "TH"},
- {eHTTPChannel, "C"},
- {eHTTPSSLChannel, "CS"},
- {eXMLParser, "X"},
- {eSMTPTransport, "TS"},
- {eClientLog, "CL"},
- {eClientWSDD, "CW"},
- {eServerLog, "SL"},
- {eRootDirectory, "A"},
- {eOffsetToLibs, "O"},
- {eServerWSDD, "SW"},
- {eSSLOptions, "SO"},
- {eVolume, "V"},
- {eAxisConfigDir, "ACD"},
- {eBackup, "B"},
- {eMerge, "M"}};
+ OPTIONLIST sOptions[] = {{eHTTPTransport, "TH"},
+ {eHTTPChannel, "C"},
+ {eHTTPSSLChannel, "CS"},
+ {eXMLParser, "X"},
+ {eSMTPTransport, "TS"},
+ {eClientLog, "CL"},
+ {eClientWSDD, "CW"},
+ {eServerLog, "SL"},
+ {eRootDirectory, "A"},
+ {eOffsetToLibs, "O"},
+ {eServerWSDD, "SW"},
+ {eSSLOptions, "SO"},
+ {eProgressInfo, "PI"},
+ {eAxisConfigDir, "ACD"},
+ {eBackup, "B"},
+ {eQueryMissingFiles, "QMF"},
+ {eMerge, "M"}};
ppsDefaultParamList[eMerge] = (char *) malloc( strlen( "off "));
- ppsDefaultParamList[eVolume] = (char *) malloc( strlen( "normal "));
+ ppsDefaultParamList[eProgressInfo] = (char *) malloc( strlen( "normal "));
ppsDefaultParamList[eBackup] = (char *) malloc( strlen( "true "));
+ ppsDefaultParamList[eQueryMissingFiles] = (char *) malloc( strlen( "on "));
strcpy( ppsDefaultParamList[eMerge], "off");
- strcpy( ppsDefaultParamList[eVolume], "normal");
+ strcpy( ppsDefaultParamList[eProgressInfo], "normal");
strcpy( ppsDefaultParamList[eBackup], "true");
+ strcpy( ppsDefaultParamList[eQueryMissingFiles], "on");
for( int iCount = 0; iCount < iParamCount; iCount++)
{
@@ -387,6 +398,7 @@
!(sOptions[iIndex].eConfType == eClientLog ||
sOptions[iIndex].eConfType == eServerLog ||
sOptions[iIndex].eConfType == eBackup ||
+ sOptions[iIndex].eConfType == eQueryMissingFiles ||
sOptions[iIndex].eConfType == eSSLOptions) &&
strchr( pParamArray[iCount], cSlash) == NULL)
{
@@ -564,40 +576,47 @@
}
else
{
- if( sDLLOffsetList.iCount > 0)
+ if( StringCompare( ppsDefaultParamList[eQueryMissingFiles], "ON"))
{
- if( sDLLOffsetList.iCount > 1)
+ if( sDLLOffsetList.iCount > 0)
{
- cout << "Select an index between 1 and " << sDLLOffsetList.iCount << " : ";
+ if( sDLLOffsetList.iCount > 1)
+ {
+ cout << "Select an index between 1 and " << sDLLOffsetList.iCount << " : ";
- int iChoice;
+ int iChoice;
- cin >> iChoice;
+ cin >> iChoice;
- if( iChoice < 1 || iChoice > sDLLOffsetList.iCount)
- {
- cout << "Number was out of range." << endl;
+ if( iChoice < 1 || iChoice > sDLLOffsetList.iCount)
+ {
+ cout << "Number was out of range." << endl;
+ }
+ else
+ {
+ ((DLLNAMEINFO *) psDLLNames->ppArray[*((int *) sDLLOffsetList.ppArray[iChoice - 1])])->bAddToClientConfig = true;
+ piConfigInfoArray[psChoiceList[iChoiceCount].eConfigType] = *((int *) sDLLOffsetList.ppArray[iChoice - 1]);
+ bHTTPTransportFound = true;
+ }
}
else
{
- ((DLLNAMEINFO *) psDLLNames->ppArray[*((int *) sDLLOffsetList.ppArray[iChoice - 1])])->bAddToClientConfig = true;
- piConfigInfoArray[psChoiceList[iChoiceCount].eConfigType] = *((int *) sDLLOffsetList.ppArray[iChoice - 1]);
+ cout << "Automatically selected " << ((DLLNAMEINFO *) psDLLNames->ppArray[*((int *) sDLLOffsetList.ppArray[0])])->pszDLLFilename << endl;
+
+ ((DLLNAMEINFO *) psDLLNames->ppArray[*((int *) sDLLOffsetList.ppArray[0])])->bAddToClientConfig = true;
+ piConfigInfoArray[psChoiceList[iChoiceCount].eConfigType] = *((int *) sDLLOffsetList.ppArray[0]);
bHTTPTransportFound = true;
}
}
else
{
- cout << "Automatically selected " << ((DLLNAMEINFO *) psDLLNames->ppArray[*((int *) sDLLOffsetList.ppArray[0])])->pszDLLFilename << endl;
+ cout << "There are no recognised file names for the type of file/library." << endl << "You will have to modify the configuration file namually." << endl << endl;
- ((DLLNAMEINFO *) psDLLNames->ppArray[*((int *) sDLLOffsetList.ppArray[0])])->bAddToClientConfig = true;
- piConfigInfoArray[psChoiceList[iChoiceCount].eConfigType] = *((int *) sDLLOffsetList.ppArray[0]);
bHTTPTransportFound = true;
}
}
else
{
- cout << "There are no recognised file names for the type of file/library." << endl << "You will have to modify the configuration file namually." << endl << endl;
-
bHTTPTransportFound = true;
}
}
Modified: webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp?rev=388501&r1=388500&r2=388501&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp (original)
+++ webservices/axis/trunk/c/src/configuration/AxisConfiguration.hpp Fri Mar 24 04:41:23 2006
@@ -34,10 +34,11 @@
eRootDirectory,
eOffsetToLibs,
eSSLOptions,
- eVolume,
+ eProgressInfo,
eMerge,
eAxisConfigDir,
eBackup,
+ eQueryMissingFiles,
eConfigMax
} ECONFIGTYPE;