[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189806 into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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.
Commit message:
Changes for Zorba 3.0 for URI module
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg 2013-10-09 02:52:32 +
+++ doc/zorba/xqdoc/images/modules.svg 2013-10-15 23:34:42 +
@@ -2041,7 +2041,7 @@
10
-http://www.zorba-xquery.com/modules/uri";>
+http://zorba.io/modules/uri";>
uri
=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
--- doc/zorba/xqdoc/images/modules_new.svg 2013-10-15 20:04:59 +
+++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-15 23:34:42 +
@@ -2054,7 +2054,7 @@
7
-http://www.zorba-xquery.com/modules/uri";>
+http://zorba.io/modules/uri";>
uri
=== modified file 'include/zorba/internal/pregenerated/qnames.h'
--- include/zorba/internal/pregenerated/qnames.h 2013-09-25 22:18:33 +
+++ include/zorba/internal/pregenerated/qnames.h 2013-10-15 23:34:42 +
@@ -92,6 +92,17 @@
zorba::diagnostic::kind kind() const;
};
+class ZORBA_DLL_PUBLIC ZorbaURIErrorQName :
+ public FixedQName
+{
+ typedef FixedQName base_type;
+public:
+ static char const NAMESPACE[];
+ static char const PREFIX[];
+ ZorbaURIErrorQName( char const *localname ) : base_type( localname ) { }
+ zorba::diagnostic::kind kind() const;
+};
+
} // namespace internal
typedef internal::SystemDiagnostic XQueryErrorCode;
@@ -100,6 +111,7 @@
typedef internal::SystemDiagnostic ZorbaWarningCode;
typedef internal::SystemDiagnostic ZorbaCSVErrorCode;
typedef internal::SystemDiagnostic ZorbaDateTimeErrorCode;
+typedef internal::SystemDiagnostic ZorbaURIErrorCode;
} // namespace zorba
#endif /* ZORBA_INTERNAL_QNAMES_H */
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-09-25 22:18:33 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-10-15 23:34:42 +
@@ -879,12 +879,6 @@
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJ2X0001_JSONML_ARRAY_BAD_JSON;
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0001_OPAQUE_WITH_OTHERS;
-
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0002_SCHEME_REQUIRED_FOR_OPAQUE;
-
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZURI0003_SLASH_NEEDED_FOR_ABSOLUTE_URI;
-
} // namespace zerr
namespace jerr {
@@ -986,6 +980,20 @@
extern ZORBA_DLL_PUBLIC ZorbaDateTimeErrorCode UNSUPPORTED_LOCALE;
} // namespace dt
+
+namespace zuri {
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode CHARSET_UNKNOWN;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode OPAQUE_COMB_NOT_VALID;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode OPAQUE_WITHOUT_SCHEME;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode INVALID_ABSOLUTE_PATH;
+
+extern ZORBA_DLL_PUBLIC ZorbaURIErrorCode URI_UNRESOLVED_OR_NOSTREAM;
+
+} // namespace zuri
} // namespace zorba
#endif /* ZORBA_DIAGNOSTIC_LIST_API_H */
/*
=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt 2013-10-14 22:29:56 +
+++ modules/CMakeLists.txt 2013-10-15 23:34:42 +
@@ -27,6 +27,7 @@
ADD_SUBDIRECTORY(sequence)
ADD_SUBDIRECTORY(store)
ADD_SUBDIRECTORY(structured-items)
+ADD_SUBDIRECTORY(uri)
ADD_SUBDIRECTORY(w3c)
ADD_SUBDIRECTORY(xml)
ADD_SUBDIRECTORY(zorba-query)
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-14 22:29:56 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-15 23:34:42 +
@@ -17,8 +17,6 @@
URI "http://www.zorba-xquery.com/modules/fetch";)
DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/reflection";)
-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
=== modified file 'modules/pregenerated/zorba-errors.xq'
--- modules/pregenerated/zorba-errors.xq 2013-10-12 01:10:05 +
+++ modules/pregenerated/zorba-errors.xq 2013-10-15 23:34:42 +
@@ -970,19 +970,4 @@
(:~
:)
-declare variable $zerr:ZJ2X0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJ2X0001");
-
-(:~
- :If the opaque-part section of the URI was specified in conjuction with other non-opaque parts.
-:)
-declare variable $zerr:ZURI0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZURI0001");
-
-(:~
- :If an opaque-part section was specified without a scheme section.
-:)
-declare variable $zerr:ZURI0002 as xs:QName := fn:QName($zerr:NS, "zerr:ZURI0002");
-
-(:~
- :If an absolute URI is specified with a path that does not start with slash ("/").
-:)
-declare variable $zerr:ZUR
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189806 into lp:zorba has been updated. Commit Message changed to: Changes for Zorba 3.0 for URI module For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189806 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189806/+merge/191316 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189788-dbgp into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1189788-dbgp into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189788-dbgp into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189788-dbgp into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189788-dbgp into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189788-dbgp/+merge/191073 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
