scheu 02/02/08 09:45:39
Modified: java/src/org/apache/axis/utils resources.properties
java/src/org/apache/axis/wsdl/fromJava Emitter.java
MethodRep.java
Log:
small java2wsdl change
Revision Changes Path
1.51 +1 -1 xml-axis/java/src/org/apache/axis/utils/resources.properties
Index: resources.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- resources.properties 6 Feb 2002 21:08:54 -0000 1.50
+++ resources.properties 8 Feb 2002 17:45:39 -0000 1.51
@@ -597,7 +597,7 @@
j2wemitter00=emitter
j2wusage00=Usage: {0}
j2woptions00=Options:
-j2wdetails00=Details:\n portType name= <class-of-portType name>\n binding
name= <--service value>SoapBinding\n service name= <--service value>Service\n
port name= <--service value>\n address location= <--location value>
+j2wdetails00=Details:\n portType name= <class-of-portType name>\n binding
name= <--service value>SoapBinding\n service name= <--service value> OR IF
CONFLICT WITH portType name: <--service value>Service\n port name= <--service
value>\n address location= <--location value>
j2wopthelp00=print this message and exit
j2woptoutput00=output Wsdl filename
j2woptlocation00=service location url
1.13 +7 -4 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Emitter.java 1 Feb 2002 22:46:13 -0000 1.12
+++ Emitter.java 8 Feb 2002 17:45:39 -0000 1.13
@@ -493,8 +493,13 @@
Service service = def.createService();
- service.setQName(
- new javax.wsdl.QName(implNS, getServiceName()+"Service"));
+ if (getServiceName().equals(clsName)) {
+ service.setQName(
+ new javax.wsdl.QName(implNS, getServiceName() + "Service"));
+ } else {
+ service.setQName(
+ new javax.wsdl.QName(implNS, getServiceName()));
+ }
def.addService(service);
Port port = def.createPort();
@@ -798,8 +803,6 @@
/**
* Sets the <code>Class</code> to export.
- * If the class looks like a skeleton class, do some searching to find the
- * interface class and try and locate and implementation class.
* @param cls the <code>Class</code> to export
* @param name service name
*/
1.5 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/fromJava/MethodRep.java
Index: MethodRep.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/MethodRep.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MethodRep.java 7 Feb 2002 21:47:43 -0000 1.4
+++ MethodRep.java 8 Feb 2002 17:45:39 -0000 1.5
@@ -90,7 +90,7 @@
public MethodRep(Method method, Class[] types, short[] modes, String[]
paramNames) {
_name = method.getName();
String retName = "return";
- if ((paramNames != null) && (paramNames[0] != null)) {
+ if ((paramNames != null) && (paramNames[0] != null) &&
!paramNames.equals("")) {
retName = paramNames[0];
}
_returns = new ParamRep(retName, method.getReturnType(), ParamRep.OUT);
