Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 51117 invoked from network); 15 Jun 2009 22:52:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jun 2009 22:52:30 -0000 Received: (qmail 88594 invoked by uid 500); 15 Jun 2009 22:52:42 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 88555 invoked by uid 500); 15 Jun 2009 22:52:42 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 88546 invoked by uid 99); 15 Jun 2009 22:52:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2009 22:52:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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, 15 Jun 2009 22:52:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 476ED2388897; Mon, 15 Jun 2009 22:52:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r785015 - in /ode/branches/APACHE_ODE_1.X: bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/ bpel-test/src/test/java/org/apache/ode/test/ bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/ Date: Mon, 15 Jun 2009 22:52:17 -0000 To: commits@ode.apache.org From: karthick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090615225217.476ED2388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: karthick Date: Mon Jun 15 22:52:16 2009 New Revision: 785015 URL: http://svn.apache.org/viewvc?rev=785015&view=rev Log: ODE-623 Using boolean global variable inside xquery doesn't work Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.bpel Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java?rev=785015&r1=785014&r2=785015&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java (original) +++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xquery10/runtime/XQuery10ExpressionRuntime.java Mon Jun 15 22:52:16 2009 @@ -18,6 +18,9 @@ */ package org.apache.ode.bpel.elang.xquery10.runtime; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.URI; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -527,6 +530,26 @@ xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_LONG); } else if (value instanceof String) { xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_STRING); + } else if (value instanceof Boolean) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_BOOLEAN); + } else if (value instanceof Date) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_DATETIME); + } else if (value instanceof BigDecimal) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_DECIMAL); + } else if (value instanceof Float) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_FLOAT); + } else if (value instanceof URI) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_ANYURI); + } else if (value instanceof QName) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_QNAME); + } else if (value instanceof BigInteger) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_INT); + } else if (value instanceof Integer) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_INTEGER); + } else if (value instanceof Double) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_DOUBLE); + } else if (value instanceof Byte) { + xqType = xqconn.createAtomicType(XQItemType.XQBASETYPE_BYTE); } else if (value instanceof Node) { xqType = xqconn.createNodeType(); } else if (value instanceof NodeList || value instanceof XQSequence) { Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java?rev=785015&r1=785014&r2=785015&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java (original) +++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/java/org/apache/ode/test/DataHandling20Test.java Mon Jun 15 22:52:16 2009 @@ -118,8 +118,7 @@ @Test public void testXQueryExpression() throws Throwable { - deploy("/bpel/2.0/TestXQueryExpression"); - go(); + go("/bpel/2.0/TestXQueryExpression"); } @Test Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.bpel URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.bpel?rev=785015&r1=785014&r2=785015&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.bpel (original) +++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestXQueryExpression/HelloXQueryWorld.bpel Mon Jun 15 22:52:16 2009 @@ -43,6 +43,9 @@ + + + @@ -121,6 +124,76 @@ not($tempVar/wsa:EndpointReference/wsa:Metadata/Service/@EndpointName eq "MyEndpoint") + + + 0 + + + + + $i < 2 + + + $i = 0 + + + "false" + + + + false() + + + + + + + "true" + + + + true() + + + + + + + + + + + if ($boolVar) then "trueValue" else "falseValue" + + + + + + not($otherVar = concat($stringVar, "Value")) + + + + + + $i + 1 + + + + +