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 rk...@apache.org on 2001/10/20 11:05:30 UTC
cvs commit: xml-axis/java/src/org/apache/axis/wsdl TypeFactory.java Emitter.java
rkumar 01/10/20 02:05:30
Modified: java/src/org/apache/axis/wsdl TypeFactory.java Emitter.java
Log:
revert last temporary change (made to prevent tests from breaking)
Revision Changes Path
1.7 +1 -13 xml-axis/java/src/org/apache/axis/wsdl/TypeFactory.java
Index: TypeFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/TypeFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TypeFactory.java 2001/10/19 12:59:15 1.6
+++ TypeFactory.java 2001/10/20 09:05:30 1.7
@@ -85,19 +85,7 @@
types = new HashMap();
mapNamespaceToPackage = new HashMap();
}
-
- public void setNamespacePrefix(String prefix) {
- nameSpacePrefix = prefix;
- }
- public String getNamespacePrefix() {
- return nameSpacePrefix;
- }
-
- public String[] getNamespaces() {
- return (String []) mapNamespaceToPackage.keySet().toArray();
- }
-
/**
* Invoke this method to associate a namespace URI with a autogenerated Java Package
* name, if an entry is not already present
@@ -105,7 +93,7 @@
*/
public void map (String namespace) {
if (mapNamespaceToPackage.get(namespace) == null) {
- mapNamespaceToPackage.put(namespace, getNamespacePrefix() + "." + Utils.makePackageName(namespace));
+ mapNamespaceToPackage.put(namespace, Utils.makePackageName(namespace));
}
}
1.71 +3 -4 xml-axis/java/src/org/apache/axis/wsdl/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Emitter.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Emitter.java 2001/10/19 17:38:23 1.70
+++ Emitter.java 2001/10/20 09:05:30 1.71
@@ -197,7 +197,6 @@
// Generate types from doc
if (doc != null) {
- emitFactory.setNamespacePrefix(packageName);
emitFactory.map(def.getTargetNamespace(), packageName);
emitFactory.buildTypes(doc);
if (bVerbose) {
@@ -1344,7 +1343,7 @@
while (p.mode != Parameter.INOUT)
p = (Parameter) parms.list.get(++i);
- if (parms.returnName != null) {
+ if (parms.returnName == null) {
pw.println (" " + p.name + "._value = " + getResponseString(p.type, "((org.apache.axis.message.RPCParam) call.getOutputParams().get(" + 0 + ")).getValue()"));
pw.println(" return " + getResponseString(parms.returnType, "resp"));
}
@@ -1742,15 +1741,15 @@
while (it.hasNext()) {
Type type = (Type) it.next();
if (type.getBaseType() == null) {
- pw.println("");
if (!nsMap.containsKey(type.getQName().getNamespaceURI())) {
+ pw.println("");
nsPrefix = "ns" + i++;
nsMap.put(type.getQName().getNamespaceURI(), nsPrefix);
pw.print(" xmlns:" + nsPrefix + "=\"" + type.getQName().getNamespaceURI() + "\"");
}
}
}
- pw.println(" >");
+ pw.println(">");
it = types.values().iterator();
while (it.hasNext()) {
Type type = (Type) it.next();