You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/05/01 06:05:39 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
dims 2005/04/30 21:05:39
Modified: java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
Log:
prevent clash with type
Revision Changes Path
1.92 +11 -11 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- JavaDeployWriter.java 18 Apr 2005 17:17:12 -0000 1.91
+++ JavaDeployWriter.java 1 May 2005 04:05:38 -0000 1.92
@@ -72,7 +72,7 @@
/** Field emitter */
protected Emitter emitter;
-
+
/**
* Constructor.
*
@@ -84,7 +84,7 @@
SymbolTable symbolTable) {
super(emitter, "deploy");
-
+
this.emitter = emitter;
this.definition = definition;
this.symbolTable = symbolTable;
@@ -399,7 +399,7 @@
if (emitter.isSkeletonWanted()) {
className += "Skeleton";
- } else
+ } else
{
String customClassName = emitter.getImplementationClassName();
if ( customClassName != null )
@@ -414,13 +414,13 @@
pw.println(" <parameter name=\"wsdlPortType\" value=\""
+ binding.getPortType().getQName().getLocalPart() + "\"/>");
- pw.println(" <parameter name=\"typeMappingVersion\" value=\""
+ pw.println(" <parameter name=\"typeMappingVersion\" value=\""
+ emitter.getTypeMappingVersion() + "\"/>");
-
+
HashSet allowedMethods = new HashSet();
String namespaceURI = binding.getQName().getNamespaceURI();
-
+
if (!emitter.isSkeletonWanted()) {
Iterator operationsIterator =
binding.getBindingOperations().iterator();
@@ -437,7 +437,7 @@
|| (type == OperationType.SOLICIT_RESPONSE)) {
continue;
}
- String javaOperName = null;
+ String javaOperName = null;
ServiceDesc serviceDesc = emitter.getServiceDesc();
if (emitter.isDeploy() && serviceDesc != null) {
@@ -452,13 +452,13 @@
log.warn("Can't find Java method for operation descriptor : " + operDesc.getName());
continue;
}
-
+
javaOperName = operDesc.getMethod().getName();
} else {
javaOperName =
JavaUtils.xmlNameToJava(operation.getName());
}
-
+
allowedMethods.add(javaOperName);
// We pass "" as the namespace argument because we're just
@@ -586,7 +586,7 @@
+ SOAPAction
+ "\"");
}
-
+
if (params.mep != null &&
params.mep != OperationType.REQUEST_RESPONSE) {
String mepString = getMepString(params.mep);
@@ -642,7 +642,7 @@
QName itemQName = Utils.getItemQName(param.getType());
if (itemQName != null) {
pw.print(" itemQName=\"");
- pw.print(Utils.genQNameAttributeString(itemQName, "tns"));
+ pw.print(Utils.genQNameAttributeString(itemQName, "itns"));
pw.print("\"");
}