Chris Hillery has proposed merging lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba.
Requested reviews: Zorba Coders (zorba-coders) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012 -- https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba.
=== modified file 'doc/code/headers_svg/zorba_headers_dependencies.xqi' --- doc/code/headers_svg/zorba_headers_dependencies.xqi 2011-08-18 19:46:33 +0000 +++ doc/code/headers_svg/zorba_headers_dependencies.xqi 2012-01-10 07:45:30 +0000 @@ -22,7 +22,7 @@ import module namespace file = "http://expath.org/ns/file";; import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";; import module namespace html = "http://www.zorba-xquery.com/modules/converters/html";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; declare namespace ann = "http://www.zorba-xquery.com/annotations";; === modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2011-08-01 17:55:38 +0000 +++ doc/zorba/xqdoc/images/modules.svg 2012-01-10 07:45:30 +0000 @@ -1006,7 +1006,7 @@ </g> <!-- functx_16 --> <g id="node89" class="node"><title>functx_16</title> -<a xlink:href="../www.functx.com_index.html" xlink:title="(Zorba-core) module uri=http://www.functx.com/";> +<a xlink:href="../www.functx.com_index.html" xlink:title="(Zorba-core) module uri=http://www.functx.com";> <ellipse fill="white" stroke="white" cx="8411" cy="-301" rx="36.0624" ry="19.0919"/> <text text-anchor="middle" x="8411" y="-297.9" font-family="Times Roman,serif" font-size="14.00" fill="red">functx</text> </a> === modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqi' --- doc/zorba/xqdoc/src/zorba_module_dependencies.xqi 2011-08-12 16:07:57 +0000 +++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqi 2012-01-10 07:45:30 +0000 @@ -26,7 +26,7 @@ import module namespace file = "http://expath.org/ns/file";; import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";; import module namespace xqdoc2html = "http://www.zorba-xquery.com/modules/xqdoc2xhtml/";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";; === modified file 'doc/zorba/xqdoc/templates/www.functx.com_index.html' --- doc/zorba/xqdoc/templates/www.functx.com_index.html 2011-08-17 19:19:17 +0000 +++ doc/zorba/xqdoc/templates/www.functx.com_index.html 2012-01-10 07:45:30 +0000 @@ -1,6 +1,6 @@ <html> <head> - <title>Documentation for http://www.functx.com/</title> + <title>Documentation for http://www.functx.com</title> <meta content="text/html; charset=UTF-8" http-equiv="content-type" /> <meta content="public" http-equiv="CACHE-CONTROL" /> <meta content="-1" http-equiv="Expires" /> @@ -82,7 +82,7 @@ </div> </div> <div id="rightcontent"> - <h1>http://www.functx.com/<sup> + <h1>http://www.functx.com<sup> <img src="images/ZCsmall.gif" alt="ZC" title="This module is part of Zorba core." /> </sup> </h1> @@ -90,7 +90,7 @@ <span id="module_description">Module Description</span> </div> <span>Before using any of the functions below please remember to import the module namespace: - <pre class="brush: xquery;">import module namespace functx = "http://www.functx.com/";;</pre> + <pre class="brush: xquery;">import module namespace functx = "http://www.functx.com";;</pre> </span> <p> -------------------------------- The FunctX XQuery Function Library @@ -132,7 +132,7 @@ <table class="varlist"> <tr> <td>functx</td> - <td>http://www.functx.com/</td> + <td>http://www.functx.com</td> </tr> </table> <div class="section"> === modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq' --- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-12-21 14:40:33 +0000 +++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2012-01-10 07:45:30 +0000 @@ -532,7 +532,7 @@ { if(($moduleUri = "http://www.w3.org/2005/xpath-functions";) or ($moduleUri = "http://www.w3.org/2005/xpath-functions/math";) or - ($moduleUri = "http://www.functx.com/";)) then + ($moduleUri = "http://www.functx.com";)) then { (:these modules never change, they have no tests, no external functions, and so on:) (:just read the content from the templates folder and compute the left menu:) @@ -1117,7 +1117,7 @@ xqdoc2html:annotations-module($module/xqdoc:comment), if(($moduleUri = "http://www.w3.org/2005/xpath-functions";) or ($moduleUri = "http://www.w3.org/2005/xpath-functions/math";) or - ($moduleUri = "http://www.functx.com/";)) then () + ($moduleUri = "http://www.functx.com";)) then () else (<div class="subsubsection">XQuery version and encoding for this module:</div>, <p class="annotationText">xquery version "{$module/xqdoc:comment/xqdoc:custom[@tag='XQuery version']/text()}" encoding "{$module/xqdoc:comment/xqdoc:custom[@tag='encoding']/text()}";</p>) === modified file 'modules/functx/CMakeLists.txt' --- modules/functx/CMakeLists.txt 2011-07-03 07:27:35 +0000 +++ modules/functx/CMakeLists.txt 2012-01-10 07:45:30 +0000 @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECLARE_ZORBA_MODULE(FILE functx.xq URI "http://www.functx.com/";) +DECLARE_ZORBA_MODULE(FILE functx.xq URI "http://www.functx.com";) === modified file 'modules/functx/functx.xq' --- modules/functx/functx.xq 2011-07-03 07:27:35 +0000 +++ modules/functx/functx.xq 2012-01-10 07:45:30 +0000 @@ -26,7 +26,7 @@ : @version 1.0 : @see http://www.xqueryfunctions.com :) -module namespace functx = "http://www.functx.com/"; ; +module namespace functx = "http://www.functx.com"; ; (:~ : Adds attributes to XML elements === modified file 'scripts/sanity_checks/conformance_xqftts.xqi' --- scripts/sanity_checks/conformance_xqftts.xqi 2011-09-06 19:24:13 +0000 +++ scripts/sanity_checks/conformance_xqftts.xqi 2012-01-10 07:45:30 +0000 @@ -19,7 +19,7 @@ module namespace conf = "http://www.zorba-xquery.com/modules/conformance";; import module namespace file = "http://expath.org/ns/file";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";; === modified file 'scripts/sanity_checks/conformance_xqts.xqi' --- scripts/sanity_checks/conformance_xqts.xqi 2011-09-06 19:24:13 +0000 +++ scripts/sanity_checks/conformance_xqts.xqi 2012-01-10 07:45:30 +0000 @@ -19,7 +19,7 @@ module namespace conf = "http://www.zorba-xquery.com/modules/conformance";; import module namespace file = "http://expath.org/ns/file";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";; === modified file 'scripts/sanity_checks/conformance_xquts.xqi' --- scripts/sanity_checks/conformance_xquts.xqi 2011-09-06 19:24:13 +0000 +++ scripts/sanity_checks/conformance_xquts.xqi 2012-01-10 07:45:30 +0000 @@ -19,7 +19,7 @@ module namespace conf = "http://www.zorba-xquery.com/modules/conformance";; import module namespace file = "http://expath.org/ns/file";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";; import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";; === modified file 'test/rbkt/Queries/zorba/functx/substring-before-last.xq' --- test/rbkt/Queries/zorba/functx/substring-before-last.xq 2011-01-12 13:34:17 +0000 +++ test/rbkt/Queries/zorba/functx/substring-before-last.xq 2012-01-10 07:45:30 +0000 @@ -1,3 +1,3 @@ -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; functx:substring-before-last('abc-def-ghi', '-') \ No newline at end of file === modified file 'test/rbkt/Queries/zorba/spec/xquery_1_0.xq' --- test/rbkt/Queries/zorba/spec/xquery_1_0.xq 2011-06-28 15:55:55 +0000 +++ test/rbkt/Queries/zorba/spec/xquery_1_0.xq 2012-01-10 07:45:30 +0000 @@ -3,7 +3,7 @@ import module namespace util = "http://www.zorba-xquery.com/util"; at "xquery_spec.xqi"; import module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; declare variable $xquery_version as xs:string := "1.0"; === modified file 'test/rbkt/Queries/zorba/spec/xquery_1_1.xq' --- test/rbkt/Queries/zorba/spec/xquery_1_1.xq 2011-04-29 22:29:04 +0000 +++ test/rbkt/Queries/zorba/spec/xquery_1_1.xq 2012-01-10 07:45:30 +0000 @@ -3,7 +3,7 @@ import module namespace util = "http://www.zorba-xquery.com/util"; at "xquery_spec.xqi"; import module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx";; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; import module namespace file = "http://expath.org/ns/file";; import schema namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";; === modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm' --- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2011-08-10 18:58:11 +0000 +++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2012-01-10 07:45:30 +0000 @@ -694,7 +694,7 @@ <span>www.functx.com</span> <ul> <li> - <a href="www.functx.com_index.html" title="http://www.functx.com/";>functx</a> + <a href="www.functx.com_index.html" title="http://www.functx.com";>functx</a> <sup> <img src="images/ZCsmall.gif" alt="ZC" title="This module is part of Zorba core." /> </sup> === modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq' --- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2011-08-19 17:04:48 +0000 +++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2012-01-10 07:45:30 +0000 @@ -67,7 +67,7 @@ return string-join( if(($moduleUri = "http://www.w3.org/2005/xpath-functions";) or ($moduleUri = "http://www.w3.org/2005/xpath-functions/math";) or - ($moduleUri = "http://www.functx.com/";) or + ($moduleUri = "http://www.functx.com";) or ($moduleUri = "http://www.w3.org/2005/xqt-errors";) or ($moduleUri = "http://www.zorba-xquery.com/errors";) or ($moduleUri = "http://www.zorba-xquery.com/warnings";)) then () @@ -111,7 +111,7 @@ (: Test for explicit XQuery Version :) if(($moduleUri = "http://www.w3.org/2005/xpath-functions";) or ($moduleUri = "http://www.w3.org/2005/xpath-functions/math";) or - ($moduleUri = "http://www.functx.com/";)) then () + ($moduleUri = "http://www.functx.com";)) then () else if (fn:not($hasXQueryVersion)) then fn:concat(" === modified file 'test/zperf/src/timings.xq' --- test/zperf/src/timings.xq 2011-08-05 02:21:55 +0000 +++ test/zperf/src/timings.xq 2012-01-10 07:45:30 +0000 @@ -16,7 +16,7 @@ module namespace tims = 'http://www.example.com/timings'; -import module namespace functx = "http://www.functx.com/";; +import module namespace functx = "http://www.functx.com";; declare namespace pdash = "http://www.28msec.com/pdash";;
-- Mailing list: https://launchpad.net/~zorba-coders Post to : [email protected] Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
