zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1189788-dbgp into lp:zorba.

Commit message:
Rename dbgp-message-handler module according to Zorba 3.0 standards.

Requested reviews:
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1189788 in Zorba: "Update core module "dbgp-message-handler""
  https://bugs.launchpad.net/zorba/+bug/1189788

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.

=== modified file 'bin/debugger/event_handler.cpp'
--- bin/debugger/event_handler.cpp	2013-02-07 17:24:36 +0000
+++ bin/debugger/event_handler.cpp	2013-10-14 22:30:41 +0000
@@ -45,7 +45,7 @@
   try {
     Zorba_CompilerHints_t lHints;
     lHints.opt_level = ZORBA_OPT_LEVEL_O1;
-    zorba::String lProlog("import module namespace dmh = 'http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler';");
+    zorba::String lProlog("import module namespace dmh = 'http://zorba.io/modules/dbgp-message-handler';");
     theStaticContext->loadProlog(lProlog, lHints);
   } catch (zorba::ZorbaException& e) {
     std::cerr << "Exception: I was not able to load the query file:" << std::endl;

=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	2013-10-09 02:52:32 +0000
+++ modules/CMakeLists.txt	2013-10-14 22:30:41 +0000
@@ -31,6 +31,10 @@
 ADD_SUBDIRECTORY(xml)
 ADD_SUBDIRECTORY(zorba-query)
 
+IF (ZORBA_WITH_DEBUGGER)
+  ADD_SUBDIRECTORY(debugger)
+ENDIF (ZORBA_WITH_DEBUGGER)
+
 
 # Add external module projects - any subdirectories of a directory
 # named "zorba_modules" as a sibling to the main Zorba source

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-10-09 02:52:32 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-10-14 22:30:41 +0000
@@ -54,9 +54,3 @@
   URI "http://www.zorba-xquery.com/modules/xqdoc/html";)
 DECLARE_ZORBA_MODULE(FILE xqdoc/menu.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/xqdoc/menu";)
-
-# debugger client DBGP message handler module
-IF (ZORBA_WITH_DEBUGGER)
-  DECLARE_ZORBA_MODULE (FILE debugger/dbgp-message-handler.xq VERSION 1.0
-    URI "http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler";)
-ENDIF (ZORBA_WITH_DEBUGGER)

=== renamed directory 'modules/com/zorba-xquery/www/modules/debugger' => 'modules/debugger'
=== modified file 'modules/debugger/dbgp-message-handler.xq'
--- modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq	2013-09-26 23:15:11 +0000
+++ modules/debugger/dbgp-message-handler.xq	2013-10-14 22:30:41 +0000
@@ -22,7 +22,7 @@
  : @author Gabriel Petrovay
  : @project Zorba/Debugger/Debugger
  :)
-module namespace dmh = "http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler";;
+module namespace dmh = "http://zorba.io/modules/dbgp-message-handler";;
 
 import module namespace base64 = "http://zorba.io/modules/base64";;
 

=== modified file 'test/rbkt/Queries/zorba/debugger/dmh/break_response.xq'
--- test/rbkt/Queries/zorba/debugger/dmh/break_response.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/debugger/dmh/break_response.xq	2013-10-14 22:30:41 +0000
@@ -1,4 +1,4 @@
-import module namespace dmh = "http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler";;
+import module namespace dmh = "http://zorba.io/modules/dbgp-message-handler";;
 
 let $e := <response command="status" status="break" reason="ok" transaction_id="5">dmh:process#1 at file.xq:10</response>
 return

=== modified file 'test/rbkt/Queries/zorba/debugger/dmh/break_response_no_info.xq'
--- test/rbkt/Queries/zorba/debugger/dmh/break_response_no_info.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/debugger/dmh/break_response_no_info.xq	2013-10-14 22:30:41 +0000
@@ -1,4 +1,4 @@
-import module namespace dmh = "http://www.zorba-xquery.com/modules/debugger/dbgp-message-handler";;
+import module namespace dmh = "http://zorba.io/modules/dbgp-message-handler";;
 
 let $e :=
   <response command="status" status="break" reason="ok" transaction_id="5">