gdaniels 02/04/14 20:01:51
Modified: java/src/org/apache/axis/client AdminClient.java
java/src/org/apache/axis/transport/http AxisServlet.java
java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
Log:
Little more code cleanup, and refactor writeOperation() to only cycle through
the params once.
Revision Changes Path
1.57 +0 -4 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- AdminClient.java 29 Mar 2002 15:05:21 -0000 1.56
+++ AdminClient.java 15 Apr 2002 03:01:51 -0000 1.57
@@ -60,17 +60,13 @@
import org.apache.axis.message.SOAPBodyElement;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Options;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.rpc.ServiceException;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
import java.net.URL;
import java.util.Vector;
1.93 +0 -1
xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- AxisServlet.java 11 Apr 2002 23:28:01 -0000 1.92
+++ AxisServlet.java 15 Apr 2002 03:01:51 -0000 1.93
@@ -81,7 +81,6 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUtils;
import java.io.ByteArrayInputStream;
import java.io.File;
1.37 +39 -51
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JavaDeployWriter.java 15 Apr 2002 02:35:58 -0000 1.36
+++ JavaDeployWriter.java 15 Apr 2002 03:01:51 -0000 1.37
@@ -293,11 +293,8 @@
if (params != null) {
QName elementQName = null;
QName returnQName = null;
- Vector paramQNames = new Vector();
- Vector paramTypes = new Vector();
- Vector paramModes = new Vector();
- // Get the operation qname
+ // Get the operation qname
Input input = operation.getInput();
if (input != null) {
Map parts = input.getMessage().getParts();
@@ -315,42 +312,14 @@
elementQName = null;
}
}
+
// Get the operation's return QName
if (params.returnName != null)
returnQName = Utils.getWSDLQName(params.returnName);
- Vector paramList = params.list;
- for (int i = 0; i < paramList.size(); i++) {
- Parameter param = (Parameter) paramList.elementAt(i);
- TypeEntry typeEntry = param.getType();
-
- QName paramQName = null;
- QName paramType = null;
- String paramMode = null;
-
- // Get the parameter type QName
- if (typeEntry instanceof DefinedElement) {
- paramType = typeEntry.getRefType().getQName();
- } else {
- paramType = typeEntry.getQName();
- }
-
- // Get the parameter name QName
- paramQName = param.getQName();
- if (paramQName == null ||
"".equals(paramQName.getNamespaceURI())) {
- paramQName = new QName("", param.getName());
- }
-
- // Get the parameter mode
- if (param.getMode() != Parameter.IN) {
- paramMode = getModeString(param.getMode());
- }
- paramQNames.add(paramQName);
- paramTypes.add(paramType);
- paramModes.add(paramMode);
- }
+ // Write the operation metadata
writeOperation(javaOperName, elementQName, returnQName,
- paramQNames, paramTypes, paramModes);
+ params);
}
}
}
@@ -377,41 +346,60 @@
/**
* Raw routine that writes out the operation and parameters.
*/
- protected void writeOperation(String javaOperName,
+ protected void writeOperation(String javaOperName,
QName elementQName,
QName returnQName,
- Vector paramQNames,
- Vector paramTypes,
- Vector paramModes) {
+ Parameters params) {
pw.print(" <operation name=\"" + javaOperName + "\"");
if (elementQName != null) {
- pw.print(" qname=\"" + Utils.genQNameAttributeString(elementQName,
"operNS") + "\"");
+ pw.print(" qname=\"" +
+ Utils.genQNameAttributeString(elementQName, "operNS") +
+ "\"");
}
if (returnQName != null) {
- pw.print(" returnQName=\"" + Utils.genQNameAttributeString(returnQName,
"retNS") + "\"");
+ pw.print(" returnQName=\"" +
+ Utils.genQNameAttributeString(returnQName, "retNS") +
+ "\"");
}
pw.println(" >");
- for (int i=0; i < paramQNames.size(); i++) {
- QName paramQName = (QName) paramQNames.elementAt(i);
- QName paramType = (QName) paramTypes.elementAt(i);
- String paramMode = (String) paramModes.elementAt(i);
+
+ Vector paramList = params.list;
+ for (int i = 0; i < paramList.size(); i++) {
+ Parameter param = (Parameter) paramList.elementAt(i);
+ TypeEntry typeEntry = param.getType();
+
+ QName paramQName = null;
+ QName paramType = null;
+
+ // Get the parameter type QName
+ if (typeEntry instanceof DefinedElement) {
+ paramType = typeEntry.getRefType().getQName();
+ } else {
+ paramType = typeEntry.getQName();
+ }
+
+ // Get the parameter name QName
+ paramQName = param.getQName();
+
pw.print(" <parameter");
- if (paramQName == null || paramQName.getNamespaceURI().equals("")) {
- pw.print(" name=\"" + paramQName.getLocalPart() + "\"" );
+ if (paramQName == null || "".equals(paramQName.getNamespaceURI())) {
+ pw.print(" name=\"" + param.getName() + "\"" );
} else {
pw.print(" qname=\"" +
Utils.genQNameAttributeString(paramQName,
"pns") + "\"");
}
+
pw.print(" type=\"" +
Utils.genQNameAttributeString(paramType,
"tns") + "\"");
- if (paramMode != null) {
- pw.print(" mode=\"" + paramMode + "\"");
- }
+ // Get the parameter mode
+ if (param.getMode() != Parameter.IN) {
+ pw.print(" mode=\"" + getModeString(param.getMode()) + "\"");
+ }
pw.println("/>");
-
}
+
pw.println(" </operation>");
}
