← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba

 

Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189806 into lp:zorba.

Requested reviews:
  Luis Rodriguez Gonzalez (kuraru)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/183528
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/183528
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-08-30 17:45:50 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-09-02 19:33:45 +0000
@@ -21,8 +21,6 @@
   URI "http://www.zorba-xquery.com/modules/reflection";)
 DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/schema";)
-DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
-  URI "http://www.zorba-xquery.com/modules/uri";)
 DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/xqdoc";)
 DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd 

=== added directory 'modules/uri'
=== added file 'modules/uri/CMakeLists.txt'
--- modules/uri/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/uri/CMakeLists.txt	2013-09-02 19:33:45 +0000
@@ -0,0 +1,16 @@
+# Copyright 2006-2013 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
+  URI "http://zorba.io/modules/uri";)

=== renamed file 'modules/com/zorba-xquery/www/modules/uri.xq' => 'modules/uri/uri.xq'
--- modules/com/zorba-xquery/www/modules/uri.xq	2013-08-09 08:27:30 +0000
+++ modules/uri/uri.xq	2013-09-02 19:33:45 +0000
@@ -23,7 +23,7 @@
  : @project Zorba/XQuery Data Model/Atomic/URI
  :
  :)
-module namespace uri = "http://www.zorba-xquery.com/modules/uri";;
+module namespace uri = "http://zorba.io/modules/uri";;
 
 declare namespace zerr = "http://zorba.io/errors";;
 declare namespace ver = "http://zorba.io/options/versioning";;