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 bu...@apache.org on 2001/10/25 23:15:25 UTC
cvs commit: xml-axis/java/src/org/apache/axis/wsdl TestCaseEmitter.java Emitter.java
butek 01/10/25 14:15:25
Modified: java/src/org/apache/axis/wsdl TestCaseEmitter.java
Emitter.java
Log:
More miscellaneous fixes for namespace/import/test case generation.
Revision Changes Path
1.11 +2 -2 xml-axis/java/src/org/apache/axis/wsdl/TestCaseEmitter.java
Index: TestCaseEmitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/TestCaseEmitter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestCaseEmitter.java 2001/10/24 18:45:56 1.10
+++ TestCaseEmitter.java 2001/10/25 21:15:25 1.11
@@ -68,7 +68,7 @@
* generated stubs.
*
* @author <a href="bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/10/24 18:45:56 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/25 21:15:25 $
*/
public class TestCaseEmitter {
@@ -135,7 +135,7 @@
this.state = TESTS;
PortType portType = binding.getPortType();
- String bindingType = portType.getQName().getLocalPart();
+ String bindingType = emitter.getTypeFactory().getJavaName(portType.getQName());
writer.println();
writer.println(" public void test" + portName + "() {");
1.82 +10 -5 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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Emitter.java 2001/10/25 17:08:51 1.81
+++ Emitter.java 2001/10/25 21:15:25 1.82
@@ -956,7 +956,7 @@
PortType portType = binding.getPortType();
String name = xmlNameToJava(bindingQName.getLocalPart());
- String portTypeName = portType.getQName().getLocalPart();
+ String portTypeName = emitFactory.getJavaName(portType.getQName());
boolean isRPC = true;
if (wsdlAttr.getBindingStyle(binding) == WsdlAttributes.STYLE_DOCUMENT) {
isRPC = false;
@@ -1405,18 +1405,19 @@
private void writeService(Service service) throws IOException {
QName serviceQName = service.getQName();
String serviceName = Utils.capitalize(xmlNameToJava(serviceQName.getLocalPart()));
+ String servicePackage = namespaces.getCreate(serviceQName.getNamespaceURI());
PrintWriter servicePW = printWriter(serviceQName, null, "java", "Generating service class: ");
TestCaseEmitter testFactory = null;
if (this.bEmitTestCase) {
- String className = serviceName = "TestCase";
+ String className = serviceName + "TestCase";
testFactory = new TestCaseEmitter(printWriter(serviceQName, "TestCase", "java", "Generating service test class: "), className, this);
- testFactory.writeHeader(className, serviceQName.getNamespaceURI());
+ testFactory.writeHeader(className, servicePackage);
testFactory.writeInitCode();
}
- writeFileHeader(serviceName + ".java", namespaces.getCreate(serviceQName.getNamespaceURI()), servicePW);
+ writeFileHeader(serviceName + ".java", servicePackage, servicePW);
// declare class
servicePW.println("public class " + serviceName + " {");
@@ -1870,9 +1871,13 @@
// Utility methods
//
- public Namespaces getNamespaces(){
+ public Namespaces getNamespaces() {
return namespaces;
} // getNamespaces
+
+ public TypeFactory getTypeFactory() {
+ return emitFactory;
+ } // getTypeFactory
/**
* Does the given file already exist?