Author: ryman
Date: Tue Nov 14 01:35:33 2006
New Revision: 474710
URL: http://svn.apache.org/viewvc?view=rev&rev=474710
Log:
[WODEN-69] Catching runtime exceptions and passing them to the error handler.
Removed:
incubator/woden/trunk/java/ant-test/documents-good-report.xml
Modified:
incubator/woden/trunk/java/ant-test/test-suite-results.zip
incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java
incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java
incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
Modified: incubator/woden/trunk/java/ant-test/test-suite-results.zip
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/test-suite-results.zip?view=diff&rev=474710&r1=474709&r2=474710
==============================================================================
Binary files - no diff available.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java?view=diff&rev=474710&r1=474709&r2=474710
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/ValidateWSDL20.java Tue
Nov 14 01:35:33 2006
@@ -289,12 +289,13 @@
wsdlLoc = wsdlLoc.replace('\\', '/');
wsdlLoc = "file:///" + wsdlLoc;
System.out.println("validating " + wsdlLoc);
-
+
reportWriter.beginWsdl(wsdlLoc);
try {
// <-- the <description> element
- DescriptionElement desc = reader.readWSDL(wsdlLoc,
reportWriter);
+ DescriptionElement desc = reader
+ .readWSDL(wsdlLoc, reportWriter);
// <-- the Description component
Description descComp = desc.toComponent();
@@ -309,16 +310,15 @@
writeVerbose(descComp);
}
- } catch (WSDLException e) {
+ } catch (Exception e) {
- reportWriter.closeReport();
- throw new BuildException(e);
- } catch (IOException ioe) {
+ if (isFailOnError()) {
- reportWriter.closeReport();
- throw new BuildException(ioe);
+ reportWriter.endWsdl();
+ reportWriter.closeReport();
+ throw new BuildException(e);
+ }
}
-
reportWriter.endWsdl();
}
reportWriter.closeReport();
@@ -327,8 +327,7 @@
private void writeVerbose(Description descComp) {
ElementDeclaration elementDeclarations[] = descComp
.getElementDeclarations();
- System.out.println("There are "
- + elementDeclarations.length
+ System.out.println("There are " + elementDeclarations.length
+ " ElementDeclaration components.");
for (int j = 0; j < elementDeclarations.length; j++) {
@@ -336,12 +335,11 @@
ElementDeclaration elementDeclaration = elementDeclarations[j];
QName name = elementDeclaration.getName();
- System.out.println("ElementDeclaration[" + j
- + "] : name = " + name);
+ System.out
+ .println("ElementDeclaration[" + j + "] : name = " + name);
}
- TypeDefinition typeDefinitions[] = descComp
- .getTypeDefinitions();
+ TypeDefinition typeDefinitions[] = descComp.getTypeDefinitions();
System.out.println("There are " + typeDefinitions.length
+ " TypeDefinition components.");
@@ -349,8 +347,7 @@
TypeDefinition typeDefinition = typeDefinitions[j];
QName name = typeDefinition.getName();
- System.out.println("TypeDefinition[" + j
- + "] : name = " + name);
+ System.out.println("TypeDefinition[" + j + "] : name = " + name);
}
Interface interfaces[] = descComp.getInterfaces();
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java?view=diff&rev=474710&r1=474709&r2=474710
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/WsdlCm.java Tue Nov 14
01:35:33 2006
@@ -139,8 +139,12 @@
} catch (FileNotFoundException e) {
e.printStackTrace();
+ } catch (RuntimeException e) {
+
+ e.printStackTrace();
}
+ reportWriter.endWsdl();
reportWriter.closeReport();
System.out.println("Finished.");
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=474710&r1=474709&r2=474710
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
Tue Nov 14 01:35:33 2006
@@ -290,6 +290,15 @@
ErrorReporter.SEVERITY_WARNING,
e);
}
+ catch (RuntimeException e)
+ {
+ getErrorReporter().reportError(
+ new ErrorLocatorImpl(), //TODO line&col nos.
+ "WSDL521",
+ new Object[] {baseURI},
+ ErrorReporter.SEVERITY_ERROR,
+ e);
+ }
if(schemaDef != null) {
schema.setSchemaDefinition(schemaDef);
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=474710&r1=474709&r2=474710
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
Tue Nov 14 01:35:33 2006
@@ -314,6 +314,16 @@
ErrorReporter.SEVERITY_WARNING,
e);
}
+ catch (RuntimeException e)
+ {
+ getErrorReporter().reportError(
+ new ErrorLocatorImpl(), //TODO line&col nos.
+ "WSDL521",
+ new Object[] {baseURI},
+ ErrorReporter.SEVERITY_ERROR,
+ e);
+ }
+
if(schemaDef != null) {
schema.setSchemaDefinition(schemaDef);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
