scheu 2002/09/26 13:59:58
Modified: java/src/org/apache/axis/providers/java JavaProvider.java
java/src/org/apache/axis/wsdl Java2WSDL.java
java/src/org/apache/axis/wsdl/fromJava Emitter.java
java/tools/org/apache/axis/tools/ant/wsdl
Java2WsdlAntTask.java
Log:
Changed the Java2WSDL STYLE_* constants back to MODE_* per Tom's note.
Don't want to change any public api's this close to release. thanks Tom.
Revision Changes Path
1.85 +3 -3
xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java
Index: JavaProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- JavaProvider.java 26 Sep 2002 20:32:55 -0000 1.84
+++ JavaProvider.java 26 Sep 2002 20:59:58 -0000 1.85
@@ -376,11 +376,11 @@
Style style = serviceDesc.getStyle();
if (style == Style.RPC) {
- emitter.setMode(Emitter.STYLE_RPC);
+ emitter.setMode(Emitter.MODE_RPC);
} else if (style == Style.DOCUMENT) {
- emitter.setMode(Emitter.STYLE_DOCUMENT);
+ emitter.setMode(Emitter.MODE_DOCUMENT);
} else if (style == Style.WRAPPED) {
- emitter.setMode(Emitter.STYLE_DOC_WRAPPED);
+ emitter.setMode(Emitter.MODE_DOC_WRAPPED);
}
emitter.setClsSmart(serviceDesc.getImplClass(), locationUrl);
1.28 +3 -3 xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java
Index: Java2WSDL.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Java2WSDL.java 26 Sep 2002 20:32:55 -0000 1.27
+++ Java2WSDL.java 26 Sep 2002 20:59:58 -0000 1.28
@@ -377,11 +377,11 @@
case STYLE_OPT:
value = option.getArgument();
if (value.equalsIgnoreCase("DOCUMENT")) {
- emitter.setMode(Emitter.STYLE_DOCUMENT);
+ emitter.setMode(Emitter.MODE_DOCUMENT);
} else if (value.equalsIgnoreCase("RPC")) {
- emitter.setMode(Emitter.STYLE_RPC);
+ emitter.setMode(Emitter.MODE_RPC);
} else if (value.equalsIgnoreCase("WRAPPED")) {
- emitter.setMode(Emitter.STYLE_DOC_WRAPPED);
+ emitter.setMode(Emitter.MODE_DOC_WRAPPED);
} else {
System.out.println(Messages.getMessage("j2woptBadStyle00"));
}
1.63 +10 -10 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Emitter.java 26 Sep 2002 20:32:55 -0000 1.62
+++ Emitter.java 26 Sep 2002 20:59:58 -0000 1.63
@@ -127,9 +127,9 @@
public static final int MODE_IMPLEMENTATION = 2;
// Style Modes
- public static final int STYLE_RPC = 0;
- public static final int STYLE_DOCUMENT = 1;
- public static final int STYLE_DOC_WRAPPED = 2;
+ public static final int MODE_RPC = 0;
+ public static final int MODE_DOCUMENT = 1;
+ public static final int MODE_DOC_WRAPPED = 2;
private Class cls;
private Class implCls; // Optional implementation class
@@ -146,7 +146,7 @@
private String serviceElementName;
private String targetService = null;
private String description;
- private int mode = STYLE_RPC;
+ private int mode = MODE_RPC;
private TypeMapping tm = null; // Registered type mapping
private TypeMapping defaultTM = null; // Default TM
private Namespaces namespaces;
@@ -619,7 +619,7 @@
binding.setQName(bindingQName);
SOAPBinding soapBinding = new SOAPBindingImpl();
- String modeStr = (mode == STYLE_RPC) ? "rpc" : "document";
+ String modeStr = (mode == MODE_RPC) ? "rpc" : "document";
soapBinding.setStyle(modeStr);
soapBinding.setTransportURI(Constants.URI_SOAP11_HTTP);
@@ -819,7 +819,7 @@
}
if (names.size() > 0) {
- if (mode == STYLE_DOC_WRAPPED) {
+ if (mode == MODE_DOC_WRAPPED) {
names.clear();
}
oper.setParameterOrdering(names);
@@ -905,7 +905,7 @@
private ExtensibilityElement writeSOAPBody(QName operQName) {
SOAPBody soapBody = new SOAPBodyImpl();
// for now, if its document, it is literal use.
- if (mode == STYLE_RPC) {
+ if (mode == MODE_RPC) {
soapBody.setUse("encoded");
soapBody.setEncodingStyles(encodingList);
} else {
@@ -1081,7 +1081,7 @@
}
switch(mode) {
- case STYLE_RPC: {
+ case MODE_RPC: {
// Add the type representing the param
// For convenience, add an element for the param
// Write <part name=param_name type=param_type>
@@ -1098,7 +1098,7 @@
}
break;
}
- case STYLE_DOCUMENT: {
+ case MODE_DOCUMENT: {
// Write the type representing the param.
// Write the element representing the param
// If an element was written
@@ -1122,7 +1122,7 @@
}
break;
}
- case STYLE_DOC_WRAPPED: {
+ case MODE_DOC_WRAPPED: {
// Write type representing the param
QName typeQName =
types.writeTypeForPart(javaType,
1.4 +3 -3
xml-axis/java/tools/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
Index: Java2WsdlAntTask.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/tools/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Java2WsdlAntTask.java 26 Sep 2002 20:32:55 -0000 1.3
+++ Java2WsdlAntTask.java 26 Sep 2002 20:59:58 -0000 1.4
@@ -149,11 +149,11 @@
}
if (style != null) {
if (style.equalsIgnoreCase("DOCUMENT")) {
- emitter.setMode(Emitter.STYLE_DOCUMENT);
+ emitter.setMode(Emitter.MODE_DOCUMENT);
} else if (style.equalsIgnoreCase("RPC")) {
- emitter.setMode(Emitter.STYLE_RPC);
+ emitter.setMode(Emitter.MODE_RPC);
} else if (style.equalsIgnoreCase("WRAPPED")) {
- emitter.setMode(Emitter.STYLE_DOC_WRAPPED);
+ emitter.setMode(Emitter.MODE_DOC_WRAPPED);
}
}
if (input != null) {
