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 2004/08/11 18:58:36 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaDefinitionWriter.java JavaSkelWriter.java JavaStubWriter.java JavaTestCaseWriter.java JavaUndeployWriter.java
dims 2004/08/11 09:58:36
Modified: java/src/org/apache/axis/wsdl/toJava
JavaDefinitionWriter.java JavaSkelWriter.java
JavaStubWriter.java JavaTestCaseWriter.java
JavaUndeployWriter.java
Log:
Patch for AXIS-1505 - all write* methods in WSDL2Java *Writers should be protected, not private so that subclasses can call or override them
from Ian P. Springer
Revision Changes Path
1.17 +1 -1 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
Index: JavaDefinitionWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JavaDefinitionWriter.java 25 Feb 2004 14:02:52 -0000 1.16
+++ JavaDefinitionWriter.java 11 Aug 2004 16:58:36 -0000 1.17
@@ -80,7 +80,7 @@
*
* @throws IOException
*/
- private void writeFaults() throws IOException {
+ protected void writeFaults() throws IOException {
ArrayList faults = new ArrayList();
1.62 +1 -1 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
Index: JavaSkelWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- JavaSkelWriter.java 10 May 2004 17:25:43 -0000 1.61
+++ JavaSkelWriter.java 11 Aug 2004 16:58:36 -0000 1.62
@@ -471,7 +471,7 @@
* @param soapAction
* @param namespace
*/
- private void writeOperation(PrintWriter pw, BindingOperation operation,
+ protected void writeOperation(PrintWriter pw, BindingOperation operation,
Parameters parms, String soapAction,
String namespace) {
1.134 +11 -11 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- JavaStubWriter.java 11 May 2004 01:25:13 -0000 1.133
+++ JavaStubWriter.java 11 Aug 2004 16:58:36 -0000 1.134
@@ -88,10 +88,10 @@
"org.apache.axis.description.ParameterDesc.INOUT"};
/** Field styles */
- static HashMap styles = new HashMap();
+ static Map styles = new HashMap();
/** Field uses */
- static HashMap uses = new HashMap();
+ static Map uses = new HashMap();
static {
styles.put(Style.DOCUMENT, "org.apache.axis.enum.Style.DOCUMENT");
@@ -464,7 +464,7 @@
* @param pw a <code>PrintWriter</code> value
* @param deferredBindings a <code>List</code> of TypeEntry objects
*/
- private void writeBindingMethods(PrintWriter pw, List deferredBindings) {
+ protected void writeBindingMethods(PrintWriter pw, List deferredBindings) {
int methodCount = calculateBindingMethodCount(deferredBindings);
@@ -495,7 +495,7 @@
*
* @param pw
*/
- private void writeOperationMap(PrintWriter pw) {
+ protected void writeOperationMap(PrintWriter pw) {
List operations = binding.getBindingOperations();
@@ -808,7 +808,7 @@
* @param pw
* @param bindOp
*/
- private void writeFaultInfo(PrintWriter pw, BindingOperation bindOp) {
+ protected void writeFaultInfo(PrintWriter pw, BindingOperation bindOp) {
Map faultMap = bEntry.getFaults();
@@ -855,7 +855,7 @@
* @param hasMIME
* @param namespace
*/
- private void writeSerializationDecls(PrintWriter pw, boolean hasMIME,
+ protected void writeSerializationDecls(PrintWriter pw, boolean hasMIME,
String namespace) {
pw.println(" java.lang.Class cls;");
@@ -908,7 +908,7 @@
* @param pw
* @param type
*/
- private void writeSerializationInit(PrintWriter pw, TypeEntry type) {
+ protected void writeSerializationInit(PrintWriter pw, TypeEntry type) {
QName qname = type.getQName();
@@ -965,7 +965,7 @@
* @param oneway
* @param opIndex
*/
- private void writeOperation(PrintWriter pw, BindingOperation operation,
+ protected void writeOperation(PrintWriter pw, BindingOperation operation,
Parameters parms, String soapAction,
String opStyle, boolean oneway, int opIndex) {
@@ -1110,7 +1110,7 @@
* @param pw
* @param parms
*/
- private void writeParameters(PrintWriter pw, Parameters parms) {
+ protected void writeParameters(PrintWriter pw, Parameters parms) {
// Write the input and inout parameter list
boolean needComma = false;
@@ -1147,7 +1147,7 @@
* @param pw
* @param parms
*/
- private void writeResponseHandling(PrintWriter pw, Parameters parms) {
+ protected void writeResponseHandling(PrintWriter pw, Parameters parms) {
pw.println(" if (_resp instanceof java.rmi.RemoteException) {");
pw.println(" throw (java.rmi.RemoteException)_resp;");
@@ -1225,7 +1225,7 @@
* @param target (either "return" or "something ="
* @param source (source String)
*/
- private void writeOutputAssign(PrintWriter pw, String target,
+ protected void writeOutputAssign(PrintWriter pw, String target,
Parameter param,
String source) {
1.60 +5 -9 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
Index: JavaTestCaseWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- JavaTestCaseWriter.java 30 Mar 2004 11:36:02 -0000 1.59
+++ JavaTestCaseWriter.java 11 Aug 2004 16:58:36 -0000 1.60
@@ -146,12 +146,10 @@
* @param pw
* @param portName
* @param portType
- * @param bEntry
- * @throws IOException
+ * @param bEntry
*/
- private final void writeServiceTestCode(
- PrintWriter pw, String portName, PortType portType, BindingEntry bEntry)
- throws IOException {
+ protected final void writeServiceTestCode(
+ PrintWriter pw, String portName, PortType portType, BindingEntry bEntry) {
Iterator ops = portType.getOperations().iterator();
@@ -311,12 +309,10 @@
*
* @param pw
* @param bindingType
- * @param portName
- * @throws IOException
+ * @param portName
*/
public final void writeBindingAssignment(
- PrintWriter pw, String bindingType, String portName)
- throws IOException {
+ PrintWriter pw, String bindingType, String portName) {
pw.println(" " + bindingType + " binding;");
pw.println(" try {");
1.18 +2 -2 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
Index: JavaUndeployWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JavaUndeployWriter.java 25 Feb 2004 14:02:52 -0000 1.17
+++ JavaUndeployWriter.java 11 Aug 2004 16:58:36 -0000 1.18
@@ -117,7 +117,7 @@
* @param pw
* @throws IOException
*/
- private void writeDeployServices(PrintWriter pw) throws IOException {
+ protected void writeDeployServices(PrintWriter pw) throws IOException {
// deploy the ports on each service
Map serviceMap = definition.getServices();
@@ -149,7 +149,7 @@
* @param port
* @throws IOException
*/
- private void writeDeployPort(PrintWriter pw, Port port) throws IOException {
+ protected void writeDeployPort(PrintWriter pw, Port port) throws IOException {
String serviceName = port.getName();