You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/06 16:56:20 UTC
svn commit: r592469 - in /incubator/cxf/branches/2.0.x-fixes: ./
tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
Author: dkulp
Date: Tue Nov 6 07:56:19 2007
New Revision: 592469
URL: http://svn.apache.org/viewvc?rev=592469&view=rev
Log:
Merged revisions 592271 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r592271 | mmao | 2007-11-05 23:49:41 -0500 (Mon, 05 Nov 2007) | 4 lines
CXF-1169
* Remove the warning messages when there's no service in the wsdl
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=592469&r1=592468&r2=592469&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Tue Nov 6 07:56:19 2007
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
@@ -351,7 +352,9 @@
@SuppressWarnings("unchecked")
private void collectValidationPoints() {
if (services.size() == 0) {
- addWarning("WSDL document does not define any services");
+ LOG.log(Level.WARNING, "WSDL document "
+ + this.definition.getDocumentBaseURI() + " does not define any services");
+ //addWarning("WSDL document does not define any services");
portTypeRefNames.addAll(this.definition.getAllPortTypes().keySet());
} else {
collectValidationPointsForBindings();
Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java?rev=592469&r1=592468&r2=592469&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java Tue Nov 6 07:56:19 2007
@@ -36,9 +36,7 @@
WSDLRefValidator validator = new WSDLRefValidator(wsdl);
assertFalse(validator.isValid());
ValidationResult results = validator.getValidationResults();
- assertEquals(1, results.getWarnings().size());
- String t = results.getWarnings().pop();
- assertEquals("WSDL document does not define any services", t);
+ assertEquals(0, results.getWarnings().size());
}
@Test
@@ -104,9 +102,7 @@
validator.isValid();
ValidationResult results = validator.getValidationResults();
- assertEquals(1, results.getWarnings().size());
- String t = results.getWarnings().pop();
- assertEquals("WSDL document does not define any services", t);
+ assertEquals(0, results.getWarnings().size());
WSDLRefValidator v = new WSDLRefValidator(wsdl);
v.setSuppressWarnings(true);