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 wh...@apache.org on 2005/01/13 17:32:02 UTC
cvs commit: ws-axis/c/src/common AxisTrace.cpp
whitlock 2005/01/13 08:32:02
Modified: c/build buildTools.xml
c/src/common AxisTrace.cpp
Log:
Minor fixes - better checking
Revision Changes Path
1.5 +2 -2 ws-axis/c/build/buildTools.xml
Index: buildTools.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTools.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildTools.xml 13 Jan 2005 15:18:00 -0000 1.4
+++ buildTools.xml 13 Jan 2005 16:32:01 -0000 1.5
@@ -24,7 +24,7 @@
<path id ="tracecp">
<fileset dir="${dir.classes}" includes="buildtools.jar"/>
</path>
- <java classname="org.apache.axis.tools.trace.TraceInstrumentor" fork="true">
+ <java classname="org.apache.axis.tools.trace.TraceInstrumentor" fork="true" failonerror="true">
<classpath refid="tracecp"/>
<arg value="-config"/>
<arg value="${dir.tools}/org/apache/axis/tools/trace/tracetool.conf"/>
@@ -50,7 +50,7 @@
<path id ="cbindcp">
<fileset dir="${dir.classes}" includes="buildtools.jar"/>
</path>
- <java classname="org.apache.axis.tools.cbindings.CBindingGenerator" fork="true">
+ <java classname="org.apache.axis.tools.cbindings.CBindingGenerator" fork="true" failonerror="true">
<classpath refid="cbindcp"/>
<arg value="-config"/>
<arg value="${dir.tools}/org/apache/axis/tools/cbindings/cbindinggenerator.conf"/>
1.52 +20 -13 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- AxisTrace.cpp 13 Jan 2005 12:37:53 -0000 1.51
+++ AxisTrace.cpp 13 Jan 2005 16:32:01 -0000 1.52
@@ -190,20 +190,27 @@
traceLine("-------------- Config File settings START ----------------");
string confLine="";
- // Note these must be kept up to date if the config enum changes - I couldn't work out how to do it automagically :-(
- char *confProps[]={"AXCONF_WSDDFILEPATH",
- "AXCONF_LOGPATH",
- "AXCONF_CLIENTLOGPATH",
- "AXCONF_CLIENTWSDDFILEPATH",
- "AXCONF_AXISHOME",
- "AXCONF_TRANSPORTHTTP",
- "AXCONF_TRANSPORTSMTP",
- "AXCONF_XMLPARSER",
- "AXCONF_NODENAME",
- "AXCONF_LISTENPORT",
- "AXCONF_SSLCHANNEL"};
+ char *confProps[]={
+ "AXCONF_WSDDFILEPATH", //1
+ "AXCONF_LOGPATH", //2
+ "AXCONF_CLIENTLOGPATH", //3
+ "AXCONF_CLIENTWSDDFILEPATH", //4
+ "AXCONF_AXISHOME", //5
+ "AXCONF_TRANSPORTHTTP", //6
+ "AXCONF_TRANSPORTSMTP", //7
+ "AXCONF_XMLPARSER", //8
+ "AXCONF_NODENAME", //9
+ "AXCONF_LISTENPORT", //10
+ "AXCONF_SSLCHANNEL_HTTP", //11
+ "AXCONF_CHANNEL_HTTP", //12
+ "AXCONF_SECUREINFO"}; //13 Please use this number in the #if below
- for (unsigned j=0; j<sizeof(confProps)/4; j++)
+// Check at build time whether the lists of properties are in sync
+#if AXCONF_LAST > 13
+#error "The list of configuration properties in AxisConfig.h and AxisTrace.cpp are different. Please keep them in sync."
+#endif
+
+ for (unsigned j=0; j<sizeof(confProps)/sizeof(char*); j++)
{
confLine ="";
confLine += confProps[j];