Merge lp:~zorba-coders/zorba/doc-fixes-3.0 into lp:zorba

[Chris Hillery]

More @project fixes; skip test schemas when generating doc.

[Chris Hillery (ceejatec)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/doc-fixes-3.0/+merge/193314

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/doc-fixes-3.0/+merge/193314

Stage "TestZorbaUbuntu" failed.
1 tests failed (8576 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/401/testReport/ to view the results.

[lp:~zorba-coders/zorba/doc-fixes-3.0]

11671. By Chris Hillery on 2013-11-08

Don't output invalid .xsd files that will trip up later "make doc" runs.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/doc-fixes-3.0/+merge/193314

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq'
--- doc/zorba/xqdoc/src/xqdoc-html.xq	2013-10-16 21:47:22 +0000
+++ doc/zorba/xqdoc/src/xqdoc-html.xq	2013-11-08 19:40:15 +0000
@@ -59,14 +59,13 @@
 where not(ends-with($schema, ".ent.xsd"))
   and not(ends-with($schema, ".dtd.xsd"))
   and not(contains($schema, "URI_PATH"))
+  and not(contains($schema, "QueryResults"))
 let $schema-doc := doc($base || $slash || trace($schema, "schema"))
 let $target-uri := $schema-doc/xs:schema/@targetNamespace/string()
 let $name := replace(replace($target-uri, "http://", ""), "/", "_")
 return {
-  (file:write-text($xqdocBuildPath || $slash || "schemas" || $slash || $name || ".xsd", $schema-doc),
   file:write-text($dest || $slash || replace(replace($target-uri, "http://", ""), "/", "_") || "-schema.xml",
                   local:write-Doxygen($schema-doc, $name, $target-uri, "schema"))
-  )
 };
 
 file:create-directory($xqdocBuildPath || $slash ||  "examples");
 
=== modified file 'modules/functx/functx.xq'
--- modules/functx/functx.xq	2013-08-09 07:33:21 +0000
+++ modules/functx/functx.xq	2013-11-08 19:40:15 +0000
@@ -25,7 +25,7 @@
 
  : @version 1.0
  : @see     http://www.xqueryfunctions.com
- : @project FunctX
+ : @project FunctX/FunctX
  :) 
 module namespace  functx = "http://www.functx.com" ;
 
 
=== modified file 'modules/sctx/sctx.jq'
--- modules/sctx/sctx.jq	2013-10-30 15:22:48 +0000
+++ modules/sctx/sctx.jq	2013-11-08 19:40:15 +0000
@@ -23,7 +23,7 @@
  :
  : @see http://www.w3.org/TR/xquery/#id-xq-static-context-components
  : @author Nicolae Brinza
- : @project Zorba/Introspection/Static Context/Static Context
+ : @project Zorba/Introspection/Static Context
  :)
 module namespace sctx = "http://zorba.io/modules/sctx";
 
 
=== modified file 'modules/store/documents.xq'
--- modules/store/documents.xq	2013-10-10 00:05:44 +0000
+++ modules/store/documents.xq	2013-11-08 19:40:15 +0000
@@ -28,7 +28,7 @@
  : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
  : @see http://zorba.io/errors
  : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
- : @project Zorba/Data Store/Documents
+ : @project Zorba/Data Store/Documents/Documents
  :)
 module namespace doc = "http://zorba.io/modules/store/documents";