From cxf-commits-return-3605-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org Tue Nov 06 04:50:07 2007 Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 41333 invoked from network); 6 Nov 2007 04:50:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Nov 2007 04:50:06 -0000 Received: (qmail 90821 invoked by uid 500); 6 Nov 2007 04:49:54 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 90768 invoked by uid 500); 6 Nov 2007 04:49:54 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 90759 invoked by uid 99); 6 Nov 2007 04:49:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2007 20:49:54 -0800 X-ASF-Spam-Status: No, hits=-98.2 required=10.0 tests=ALL_TRUSTED,SUBJECT_DRUG_GAP_L X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2007 04:50:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 07AAF1A9832; Mon, 5 Nov 2007 20:49:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r592271 - in /incubator/cxf/trunk/tools/validator/src: main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java Date: Tue, 06 Nov 2007 04:49:42 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071106044943.07AAF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Mon Nov 5 20:49:41 2007 New Revision: 592271 URL: http://svn.apache.org/viewvc?rev=592271&view=rev Log: CXF-1169 * Remove the warning messages when there's no service in the wsdl Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=592271&r1=592270&r2=592271&view=diff ============================================================================== --- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original) +++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Mon Nov 5 20:49:41 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/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java?rev=592271&r1=592270&r2=592271&view=diff ============================================================================== --- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java (original) +++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java Mon Nov 5 20:49:41 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);