Merge lp:~zorba-coders/zorba/bug-907624 into lp:zorba

[Chris Hillery]

Make error message for ZXQP0029 more general-purpose.

[Chris Hillery (ceejatec)]

review: Approve

[Chris Hillery (ceejatec)]

Dennis, since you've been looking at DENY_ACCESS recently, would you mind voting on this trivial change?

[Dennis Knochenwefel (dennis-knochenwefel)]

Good improvement.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-907624-2012-04-24T11-16-03.693Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-907624-2012-04-24T11-16-03.693Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-04-23 10:46:38 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-04-24 10:59:20 +0000
@@ -1698,7 +1698,7 @@
     </diagnostic>
 
     <diagnostic code="ZXQP0029" name="URI_ACCESS_DENIED">
-      <value>"$1": module import not allowed</value>
+      <value>"$1": URI access not allowed</value>
     </diagnostic>
 
     <diagnostic code="ZXQP0030" name="DEADLOCK">

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2012-04-23 10:46:38 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-04-24 10:59:20 +0000
@@ -414,7 +414,7 @@
   { "ZXQP0025", "item creation failed" },
   { "ZXQP0026", "\"$1\": invalid enumerated value for $2" },
   { "ZXQP0028", "\"$1\": target namespace not provided by module from $2" },
-  { "ZXQP0029", "\"$1\": module import not allowed" },
+  { "ZXQP0029", "\"$1\": URI access not allowed" },
   { "ZXQP0030", "deadlock" },
   { "ZXQP0031", "malformed XQueryX XML input${: 1}" },
   { "ZXQP0032", "error transforming XQueryX to XQuery${: 1}" },