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/07 13:05:40 UTC
cvs commit: ws-axis/c/include/axis AxisException.hpp BasicHandler.hpp BasicNode.hpp IHeaderBlock.hpp
whitlock 2005/01/07 04:05:40
Modified: c build.xml
c/build buildTools.xml
c/include/axis AxisException.hpp BasicHandler.hpp
BasicNode.hpp IHeaderBlock.hpp
Log:
Run the C binding generator as part of the ant build
Revision Changes Path
1.16 +1 -1 ws-axis/c/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 7 Jan 2005 09:50:37 -0000 1.15
+++ build.xml 7 Jan 2005 12:05:40 -0000 1.16
@@ -156,7 +156,7 @@
<antcall target="compileServer" inheritall="true"/>
</target>
- <target name="buildAll" depends="compile, compileWSDL2Ws, buildWSDL2WsJARFile, buildDocumentation"/>
+ <target name="buildAll" depends="compile, compileWSDL2Ws, buildWSDL2WsJARFile, generateCBindings, buildDocumentation"/>
<target name="build" depends="initialize"
1.2 +23 -6 ws-axis/c/build/buildTools.xml
Index: buildTools.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTools.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildTools.xml 7 Jan 2005 09:50:37 -0000 1.1
+++ buildTools.xml 7 Jan 2005 12:05:40 -0000 1.2
@@ -16,12 +16,16 @@
</jar>
</target>
- <target name="runTraceTool">
- <path id ="cp">
+ <!--
+ Compile, package and run the trace tool
+ -->
+ <target name="addTrace" depends="buildTools"
+ description="Run the trace tool">
+ <path id ="tracecp">
<fileset dir="${dir.classes}" includes="buildtools.jar"/>
</path>
<java classname="org.apache.axis.tools.trace.TraceInstrumentor" fork="true">
- <classpath refid="cp"/>
+ <classpath refid="tracecp"/>
<arg value="-config"/>
<arg value="${dir.tools}/org/apache/axis/tools/trace/tracetool.conf"/>
<arg value="-include"/>
@@ -36,9 +40,22 @@
</target>
<!--
- Compile, package and run the trace tool
+ Compile, package and run the C binding generator
-->
- <target name="addTrace" depends="buildTools, runTraceTool"
- description="Compile, jar and run the trace tool"/>
+ <target name="generateCBindings" depends="buildTools"
+ description="Run the C binding generator tool">
+ <path id ="cbindcp">
+ <fileset dir="${dir.classes}" includes="buildtools.jar"/>
+ </path>
+ <java classname="org.apache.axis.tools.cbindings.CBindingGenerator" fork="true">
+ <classpath refid="cbindcp"/>
+ <arg value="-config"/>
+ <arg value="${dir.tools}/org/apache/axis/tools/cbindings/cbindinggenerator.conf"/>
+ <arg value="-source"/>
+ <arg value="${dir.include}"/>
+ <arg value="-target"/>
+ <arg value="${dir.obj}/include"/>
+ </java>
+ </target>
</project>
1.5 +2 -2 ws-axis/c/include/axis/AxisException.hpp
Index: AxisException.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/AxisException.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisException.hpp 7 Jan 2005 11:13:24 -0000 1.4
+++ AxisException.hpp 7 Jan 2005 12:05:40 -0000 1.5
@@ -50,7 +50,7 @@
#define CONFIG_FAULT_OFFSET 0x6000
#define AXISC_FAULT_OFFSET 0x7000
-enum AXISC_EXCEPTIONS
+typedef enum
{
/*The notation used for naming these exceptions is as follows
*CLIENT at the beginning means when this interpreted as a soap fault
@@ -157,7 +157,7 @@
* code.
*/
/*72*/ FAULT_LAST
-};
+} AXISC_EXCEPTIONS;
/**
* @class AxisException
1.3 +1 -1 ws-axis/c/include/axis/BasicHandler.hpp
Index: BasicHandler.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/BasicHandler.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicHandler.hpp 23 Nov 2004 15:48:56 -0000 1.2
+++ BasicHandler.hpp 7 Jan 2005 12:05:40 -0000 1.3
@@ -31,7 +31,7 @@
AXIS_CPP_NAMESPACE_START
-enum HANDLER_TYPE { NORMAL_HANDLER, WEBSERVICE_HANDLER, CHAIN_HANDLER };
+typedef enum { NORMAL_HANDLER, WEBSERVICE_HANDLER, CHAIN_HANDLER } HANDLER_TYPE;
typedef struct
{
1.4 +1 -1 ws-axis/c/include/axis/BasicNode.hpp
Index: BasicNode.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/BasicNode.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicNode.hpp 17 Dec 2004 11:49:44 -0000 1.3
+++ BasicNode.hpp 7 Jan 2005 12:05:40 -0000 1.4
@@ -32,7 +32,7 @@
class SoapSerializer;
-enum NODE_TYPE { ELEMENT_NODE=1, CHARACTER_NODE};
+typedef enum { ELEMENT_NODE=1, CHARACTER_NODE} NODE_TYPE;
/*
* @class BasicNode
1.5 +2 -2 ws-axis/c/include/axis/IHeaderBlock.hpp
Index: IHeaderBlock.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IHeaderBlock.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IHeaderBlock.hpp 3 Jan 2005 06:06:21 -0000 1.4
+++ IHeaderBlock.hpp 7 Jan 2005 12:05:40 -0000 1.5
@@ -23,12 +23,12 @@
AXIS_CPP_NAMESPACE_START
-enum HEADER_BLOCK_STD_ATTR_TYPE
+typedef enum
{ ROLE_NEXT=1, ROLE_NONE=2,
ROLE_ULTIMATE_RECEIVER=3,
ACTOR=4, MUST_UNDERSTAND_TRUE= 5,
MUST_UNDERSTAND_FALSE=6
-};
+} HEADER_BLOCK_STD_ATTR_TYPE;
/**