You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by ry...@apache.org on 2006/07/06 20:40:20 UTC
svn commit: r419647 - in /incubator/woden/java:
ant-test/documents-bad-report.xml ant-test/documents-good-report.xml
ant-test/test-suite-results.zip src/org/apache/woden/ant/Report.java
Author: ryman
Date: Thu Jul 6 11:40:20 2006
New Revision: 419647
URL: http://svn.apache.org/viewvc?rev=419647&view=rev
Log:
WODEN-43
Added <success> to validation report written by Ant task.
Modified:
incubator/woden/java/ant-test/documents-bad-report.xml
incubator/woden/java/ant-test/documents-good-report.xml
incubator/woden/java/ant-test/test-suite-results.zip
incubator/woden/java/src/org/apache/woden/ant/Report.java
Modified: incubator/woden/java/ant-test/documents-bad-report.xml
URL: http://svn.apache.org/viewvc/incubator/woden/java/ant-test/documents-bad-report.xml?rev=419647&r1=419646&r2=419647&view=diff
==============================================================================
--- incubator/woden/java/ant-test/documents-bad-report.xml (original)
+++ incubator/woden/java/ant-test/documents-bad-report.xml Thu Jul 6 11:40:20 2006
@@ -2,6 +2,7 @@
<report xmlns='http://www.w3.org/2006/06/wsdl/ValidationReport'>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -13,6 +14,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -40,6 +42,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -67,6 +70,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -94,6 +98,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -113,20 +118,23 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Import-3B/XSDImportValid.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Include-1B/Echo.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Include-1B/EchoImpl.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl</uri>
- <error>
- <errorLocator>
- <lineNumber>0</lineNumber>
- <columnNumber>0</columnNumber>
- </errorLocator>
- <key>Interface-0031</key>
- <message>The styleDefault attribute contains the IRI 'wsdl/style/uri', which is not absolute. All IRIs specified for styleDefault must be absolute.</message>
- </error>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -138,6 +146,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -156,7 +165,60 @@
</error>
</wsdl>
<wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-10B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-11B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-12B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-13B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-1B/rpcstyleinonly.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-2B/rpcstyleinonly.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-3B/rpcstyleinonly.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-4B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-5B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-6B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-7B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-8B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/RPC-9B/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-12B/Service.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -176,6 +238,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-13B/Service.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -203,6 +266,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-14B/Service.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -222,6 +286,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-15B/Service.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -241,6 +306,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-1B/Service.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -268,6 +334,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/Service-2B/Service.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -287,6 +354,7 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl</uri>
+ <success>true</success>
<warning>
<errorLocator>
<lineNumber>0</lineNumber>
Modified: incubator/woden/java/ant-test/documents-good-report.xml
URL: http://svn.apache.org/viewvc/incubator/woden/java/ant-test/documents-good-report.xml?rev=419647&r1=419646&r2=419647&view=diff
==============================================================================
--- incubator/woden/java/ant-test/documents-good-report.xml (original)
+++ incubator/woden/java/ant-test/documents-good-report.xml Thu Jul 6 11:40:20 2006
@@ -2,92 +2,147 @@
<report xmlns='http://www.w3.org/2006/06/wsdl/ValidationReport'>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Compound1-1G/compound1.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/CreditCardFaults-1G/credit-card-faults.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Echo-1G/echo.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/EchoComplexDocLit-1G/Axis2SampleDocLit.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Feature-1G/bank.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/GreatH-2G/primer-hotelReservationService.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/GreatH-3G/primer-hotelReservationService.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/HTTPBinding-1G/Echo.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/HTTPBinding-2G/Echo.wsdl</uri>
+ <success>false</success>
<error>
<errorLocator>
<lineNumber>0</lineNumber>
<columnNumber>0</columnNumber>
</errorLocator>
<key>Endpoint-0066</key>
- <message>The binding 'org.apache.woden.internal.wsdl20.BindingImpl@754efdef' specified for this endpoint specifies the interface 'org.apache.woden.internal.wsdl20.InterfaceImpl@722fbdef' and not the interface 'org.apache.woden.internal.wsdl20.InterfaceImpl@7464fdef' specified by the service. The binding specified for this endpoint must either not specify an interface or specify the same interface as the service.</message>
+ <message>The binding 'org.apache.woden.internal.wsdl20.BindingImpl@1db26e24' specified for this endpoint specifies the interface 'org.apache.woden.internal.wsdl20.InterfaceImpl@1c706e24' and not the interface 'org.apache.woden.internal.wsdl20.InterfaceImpl@779ae24' specified by the service. The binding specified for this endpoint must either not specify an interface or specify the same interface as the service.</message>
</error>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Import-2G/XSDImport.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ImportedWSDL-1G/retrieveDetails.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/InOnlyMEP-1G/Oneway.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Include-1G/Echo.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Include-1G/EchoImpl.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-1G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-2G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-3G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-4G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-5G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-6G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Interface-7G/Interface.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/RPC-1G/rpcstyleinout.wsdl</uri>
+ <success>true</success>
+ </wsdl>
+ <wsdl>
+ <uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/RPC-2G/rpcstyleinonly.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl</uri>
+ <success>true</success>
<warning>
<errorLocator>
<lineNumber>0</lineNumber>
@@ -102,44 +157,58 @@
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Service-1G/Service.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Service-2G/Service.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/Service-3G/Service.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/SparqlQuery-1G/sparql-protocol-query.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-2G/reservationItems.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl</uri>
+ <success>true</success>
</wsdl>
<wsdl>
<uri>file:///D:/workspaces/WSD2/desc/test-suite/documents/good/XsImport-3G/reservationItems.wsdl</uri>
+ <success>true</success>
</wsdl>
</report>
Modified: incubator/woden/java/ant-test/test-suite-results.zip
URL: http://svn.apache.org/viewvc/incubator/woden/java/ant-test/test-suite-results.zip?rev=419647&r1=419646&r2=419647&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/woden/java/src/org/apache/woden/ant/Report.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/ant/Report.java?rev=419647&r1=419646&r2=419647&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/ant/Report.java (original)
+++ incubator/woden/java/src/org/apache/woden/ant/Report.java Thu Jul 6 11:40:20 2006
@@ -4,6 +4,7 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.PrintWriter;
+import java.util.Vector;
import org.apache.woden.ErrorHandler;
import org.apache.woden.ErrorInfo;
@@ -24,6 +25,8 @@
private final String WSDL = "wsdl";
private final String URI = "uri";
+
+ private final String SUCCESS = "success";
// ErrorHandler elements
@@ -56,6 +59,12 @@
// Exception element
private final String DETAIL_MESSAGE = "detailMessage";
+
+
+ // error handler data
+ private boolean success = true;
+ private Vector errorInfos = null;
+ private Vector severities = null;
/**
* Creates a report writer and writes the document root.
@@ -115,28 +124,53 @@
}
public void beginWsdl(String uri) {
+
+ success = true;
+ errorInfos = new Vector();
+ severities = new Vector();
+
beginElement(WSDL);
element(URI, uri);
}
public void endWsdl() {
+
+ write(SUCCESS, success);
+
+ for(int i = 0; i < errorInfos.size(); i ++) {
+
+ ErrorInfo errorInfo = (ErrorInfo) errorInfos.elementAt(i);
+ String severity = (String) severities.elementAt(i);
+
+ write(severity, errorInfo);
+ }
+
endElement();
+
+ success = true;
+ errorInfos = null;
+ severities = null;
}
public void warning(ErrorInfo errorInfo) {
-
- write(WARNING, errorInfo);
+
+ errorInfos.add(errorInfo);
+ severities.add(WARNING);
}
public void error(ErrorInfo errorInfo) {
- write(ERROR, errorInfo);
+ success = false;
+ errorInfos.add(errorInfo);
+ severities.add(ERROR);
}
public void fatalError(ErrorInfo errorInfo) {
- write(FATAL_ERROR, errorInfo);
+ success = false;
+ errorInfos.add(errorInfo);
+ severities.add(FATAL_ERROR);
}
public void write(String tag, ErrorInfo errorInfo) {
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org