zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #24983
[Merge] lp:~zorba-coders/zorba/bug-1210410-image into lp:zorba/image-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1210410-image into lp:zorba/image-module.
Commit message:
Updated options and annotations URIs to zorba.io.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1210410-image/+merge/179377
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1210410-image/+merge/179377
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1210410-image into lp:zorba/image-module.
=== modified file 'src/com/zorba-xquery/www/modules/image/animation.xq'
--- src/com/zorba-xquery/www/modules/image/animation.xq 2013-06-15 19:41:03 +0000
+++ src/com/zorba-xquery/www/modules/image/animation.xq 2013-08-09 09:47:46 +0000
@@ -26,7 +26,7 @@
module namespace anim = 'http://www.zorba-xquery.com/modules/image/animation';
declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare namespace ver = "http://zorba.io/options/versioning";
declare option ver:module-version "1.0";
(:~
=== modified file 'src/com/zorba-xquery/www/modules/image/basic.xq'
--- src/com/zorba-xquery/www/modules/image/basic.xq 2013-06-15 19:41:03 +0000
+++ src/com/zorba-xquery/www/modules/image/basic.xq 2013-08-09 09:47:46 +0000
@@ -49,7 +49,7 @@
declare namespace err = "http://www.w3.org/2005/xqt-errors";
declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare namespace ver = "http://zorba.io/options/versioning";
declare namespace svg = "http://www.w3.org/2000/svg";
declare option ver:module-version "2.0";
=== modified file 'src/com/zorba-xquery/www/modules/image/manipulation.xq'
--- src/com/zorba-xquery/www/modules/image/manipulation.xq 2013-06-15 19:41:03 +0000
+++ src/com/zorba-xquery/www/modules/image/manipulation.xq 2013-08-09 09:47:46 +0000
@@ -50,7 +50,7 @@
declare namespace err = "http://www.w3.org/2005/xqt-errors";
declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare namespace ver = "http://zorba.io/options/versioning";
declare option ver:module-version "1.0";
(:~
=== modified file 'src/com/zorba-xquery/www/modules/image/paint.xq'
--- src/com/zorba-xquery/www/modules/image/paint.xq 2013-06-15 19:41:03 +0000
+++ src/com/zorba-xquery/www/modules/image/paint.xq 2013-08-09 09:47:46 +0000
@@ -42,7 +42,7 @@
declare namespace err = "http://www.w3.org/2005/xqt-errors";
declare namespace ierr = "http://www.zorba-xquery.com/modules/image/error";
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare namespace ver = "http://zorba.io/options/versioning";
declare option ver:module-version "1.0";
=== modified file 'test/Queries/image/animation.xq'
--- test/Queries/image/animation.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/animation.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace ani = 'http://www.zorba-xquery.com/modules/image/animation';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/basic.xq'
--- test/Queries/image/basic.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/basic.xq 2013-08-09 09:47:46 +0000
@@ -6,7 +6,7 @@
import module namespace basic = 'http://www.zorba-xquery.com/modules/image/basic';
import module namespace file = 'http://expath.org/ns/file';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/manipulation_1.xq'
--- test/Queries/image/manipulation_1.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/manipulation_1.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/manipulation_2.xq'
--- test/Queries/image/manipulation_2.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/manipulation_2.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/manipulation_3.xq'
--- test/Queries/image/manipulation_3.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/manipulation_3.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/manipulation_4.xq'
--- test/Queries/image/manipulation_4.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/manipulation_4.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/manipulation_5.xq'
--- test/Queries/image/manipulation_5.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/manipulation_5.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace man = 'http://www.zorba-xquery.com/modules/image/manipulation';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/paint_1.xq'
--- test/Queries/image/paint_1.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/paint_1.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/paint_2.xq'
--- test/Queries/image/paint_2.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/paint_2.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
import schema namespace img = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/paint_3.xq'
--- test/Queries/image/paint_3.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/paint_3.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
import schema namespace img = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/paint_4.xq'
--- test/Queries/image/paint_4.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/paint_4.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/paint_5.xq'
--- test/Queries/image/paint_5.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/paint_5.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
=== modified file 'test/Queries/image/paint_6.xq'
--- test/Queries/image/paint_6.xq 2012-04-11 09:50:23 +0000
+++ test/Queries/image/paint_6.xq 2013-08-09 09:47:46 +0000
@@ -8,7 +8,7 @@
import module namespace paint = 'http://www.zorba-xquery.com/modules/image/paint';
import schema namespace image = 'http://www.zorba-xquery.com/modules/image/image';
-declare namespace an = "http://www.zorba-xquery.com/annotations";
+declare namespace an = "http://zorba.io/annotations";
declare variable $local:image-dir := fn:concat(file:dir-name(fn:static-base-uri()), "/images/");
declare variable $local:jpg as xs:base64Binary := basic:create(xs:unsignedInt(100), xs:unsignedInt(100), image:imageFormat("JPEG"));
Follow ups