butek 2002/10/02 13:09:00 Modified: java/src/org/apache/axis/description Tag: explicitHeaderWork ParameterDesc.java java/src/org/apache/axis/wsdl/toJava Tag: explicitHeaderWork JavaDeployWriter.java JavaSkelWriter.java Log: Generate header-aware skeleton and deploy.wsdd. Revision Changes Path No revision No revision 1.22.6.2 +6 -1 xml-axis/java/src/org/apache/axis/description/ParameterDesc.java Index: ParameterDesc.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ParameterDesc.java,v retrieving revision 1.22.6.1 retrieving revision 1.22.6.2 diff -u -r1.22.6.1 -r1.22.6.2 --- ParameterDesc.java 2 Oct 2002 19:32:48 -0000 1.22.6.1 +++ ParameterDesc.java 2 Oct 2002 20:09:00 -0000 1.22.6.2 @@ -141,10 +141,15 @@ * @param mode IN, OUT, INOUT * @param typeQName the parameter's XML type QName * @param javaType the parameter's javaType + * @param inHeader does this parameter go into the input message header? + * @param inHeader does this parameter go into the output message header? */ - public ParameterDesc(QName name, byte mode, QName typeQName, Class javaType) { + public ParameterDesc(QName name, byte mode, QName typeQName, + Class javaType, boolean inHeader, boolean outHeader) { this(name,mode,typeQName); this.javaType = javaType; + this.inHeader = inHeader; + this.outHeader = outHeader; } public String toString() { No revision No revision 1.65.4.1 +15 -0 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java Index: JavaDeployWriter.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v retrieving revision 1.65 retrieving revision 1.65.4.1 diff -u -r1.65 -r1.65.4.1 --- JavaDeployWriter.java 26 Sep 2002 17:04:02 -0000 1.65 +++ JavaDeployWriter.java 2 Oct 2002 20:09:00 -0000 1.65.4.1 @@ -442,6 +442,21 @@ if (param.getMode() != Parameter.IN) { pw.print(" mode=\"" + getModeString(param.getMode()) + "\""); } + + // Is this a header? + // NOTE: the symbol table will have to change eventually to distinguish + // between the input and output aspects of INOUT parameters. One COULD + // be in the header while the other could be in the body. Right now the + // symbol table assumes it's all or nothing. + if (param.inHeader()) { + if (param.getMode() != Parameter.OUT) { + pw.print(" inHeader=\"true\""); + } + if (param.getMode() != Parameter.IN) { + pw.print(" outHeader=\"true\""); + } + } + pw.println("/>"); } 1.49.6.1 +11 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java Index: JavaSkelWriter.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v retrieving revision 1.49 retrieving revision 1.49.6.1 diff -u -r1.49 -r1.49.6.1 --- JavaSkelWriter.java 22 Sep 2002 06:13:42 -0000 1.49 +++ JavaSkelWriter.java 2 Oct 2002 20:09:00 -0000 1.49.6.1 @@ -185,12 +185,22 @@ // Get the QNames representing the parameter name and type QName paramName = p.getQName(); QName paramType = Utils.getXSIType(p); + + // Is this parameter a header? + // NOTE: the symbol table will have to change eventually to distinguish + // between the input and output aspects of INOUT parameters. One COULD + // be in the header while the other could be in the body. Right now the + // symbol table assumes it's all or nothing. + String inHeader = p.inHeader() ? "true" : "false"; + String outHeader = inHeader; pw.println(" " + "new org.apache.axis.description.ParameterDesc(" + Utils.getNewQName(paramName) + ", " + modeStr + ", " + Utils.getNewQName(paramType) + - ", " + Utils.getParameterTypeName(p) + ".class), "); + ", " + Utils.getParameterTypeName(p) + ".class" + + ", " + inHeader + + ", " + outHeader + "), "); } pw.println(" };");