dims 2002/09/24 05:38:41
Modified: java/src/org/apache/axis/wsdl/toJava
JavaDefinitionWriter.java JavaWriter.java
Added: java/src/org/apache/axis/wsdl/toJava
DuplicateFileException.java
Log:
Fix for 12485 - JavaWriter throws IOException when writing Faults - that's BAD
Revision Changes Path
1.10 +8 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
Index: JavaDefinitionWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JavaDefinitionWriter.java 20 Jun 2002 20:35:47 -0000 1.9
+++ JavaDefinitionWriter.java 24 Sep 2002 12:38:41 -0000 1.10
@@ -74,6 +74,7 @@
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.symbolTable.MessageEntry;
+import org.apache.axis.utils.Messages;
/**
* This is Wsdl2java's Definition Writer.
@@ -148,8 +149,13 @@
}
if (emitSimpleFault) {
QName faultQName = (QName) entry.getValue();
- new JavaFaultWriter(emitter, faultQName, fault,
- symbolTable).generate();
+ try {
+ new JavaFaultWriter(emitter, faultQName, fault,
+ symbolTable).generate();
+ } catch (DuplicateFileException dfe) {
+ System.err.println(
+ Messages.getMessage("fileExistError00",
dfe.getFileName()));
+ }
}
}
} // writeFaults
1.21 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java
Index: JavaWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JavaWriter.java 18 Sep 2002 16:10:37 -0000 1.20
+++ JavaWriter.java 24 Sep 2002 12:38:41 -0000 1.21
@@ -137,7 +137,7 @@
public void generate() throws IOException {
String file = getFileName();
if (isFileGenerated(file)) {
- throw new IOException(Messages.getMessage("duplicateFile00", file));
+ throw new DuplicateFileException(Messages.getMessage("duplicateFile00",
file), file);
}
registerFile(file);
if (emitter.isVerbose()) {
1.1
xml-axis/java/src/org/apache/axis/wsdl/toJava/DuplicateFileException.java
Index: DuplicateFileException.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.axis.wsdl.toJava;
import java.io.IOException;
public class DuplicateFileException extends IOException {
private String filename = null;
public DuplicateFileException(String message, String filename){
super(message);
this.filename = filename;
}
public String getFileName() {
return this.filename;
}
}
