Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 80156 invoked from network); 12 May 2008 17:02:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 May 2008 17:02:49 -0000 Received: (qmail 45017 invoked by uid 500); 12 May 2008 17:02:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 44962 invoked by uid 500); 12 May 2008 17:02:51 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 44951 invoked by uid 99); 12 May 2008 17:02:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 10:02:51 -0700 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 17:01:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 90CB22388A39; Mon, 12 May 2008 10:02:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655562 - in /cxf/trunk/tools/validator/src: main/java/org/apache/cxf/tools/validator/internal/ main/java/org/apache/cxf/tools/validator/internal/model/ test/java/org/apache/cxf/tools/validator/ test/resources/validator_wsdl/ Date: Mon, 12 May 2008 17:02:14 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080512170214.90CB22388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon May 12 10:02:14 2008 New Revision: 655562 URL: http://svn.apache.org/viewvc?rev=655562&view=rev Log: Fix and issue with not being able to validate a valid wsdl that uses defaults for portType operation message names Added: cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl (with props) Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=655562&r1=655561&r2=655562&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Mon May 12 10:02:14 2008 @@ -329,6 +329,10 @@ XInput oNode = new XInput(); oNode.setName(name); oNode.setParentNode(opVNode); + + if (name != null && name.equals(opVNode.getAttributeValue() + "Request")) { + oNode.setDefaultAttributeValue(true); + } return oNode; } @@ -336,6 +340,9 @@ XOutput oNode = new XOutput(); oNode.setName(name); oNode.setParentNode(opVNode); + if (name != null && name.equals(opVNode.getAttributeValue() + "Response")) { + oNode.setDefaultAttributeValue(true); + } return oNode; } Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java?rev=655562&r1=655561&r2=655562&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java (original) +++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java Mon May 12 10:02:14 2008 @@ -32,6 +32,7 @@ private QName name; private String attributeName; private String attributeValue; + private boolean isDefaultAttributeValue; private XNode parentNode; private XNode failurePoint; @@ -77,7 +78,14 @@ public void setAttributeValue(final String newAttributeValue) { this.attributeValue = newAttributeValue; } - + + public void setDefaultAttributeValue(boolean b) { + this.isDefaultAttributeValue = b; + } + public boolean isDefaultAttributeValue() { + return this.isDefaultAttributeValue; + } + public XNode getParentNode() { return parentNode; } @@ -118,11 +126,18 @@ sb.append(":"); sb.append(name.getLocalPart()); if (!StringUtils.isEmpty(attributeName) && !StringUtils.isEmpty(attributeValue)) { - sb.append("[@"); + sb.append("["); + if (isDefaultAttributeValue) { + sb.append("not(@"); + sb.append(attributeName); + sb.append(") or "); + } + sb.append("@"); sb.append(attributeName); sb.append("='"); sb.append(attributeValue); - sb.append("']"); + sb.append("'"); + sb.append("]"); } return sb.toString(); } Modified: cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=655562&r1=655561&r2=655562&view=diff ============================================================================== --- cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original) +++ cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Mon May 12 10:02:14 2008 @@ -31,6 +31,14 @@ public void setUp() { super.setUp(); } + + @Test + public void testValidateDefaultOpMessageNames() throws Exception { + String[] args = new String[] {"-verbose", + getLocation("/validator_wsdl/defaultOpMessageNames.wsdl")}; + WSDLValidator.main(args); + assertTrue(this.getStdOut().contains("Valid WSDL")); + } @Test public void testValidateUniqueBody() throws Exception { Added: cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl?rev=655562&view=auto ============================================================================== --- cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl (added) +++ cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl Mon May 12 10:02:14 2008 @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml