ebl Add catalog to messages resource

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7302 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/bacula-dir-2client.conf.in b/regress/scripts/bacula-dir-2client.conf.in
index 636cfaa43e595e3ae724357b66dddbdc8a3fc16a..06e529e88b8b211f6d507272eabbc0a7ee3aa337 100644 (file)
--- a/regress/scripts/bacula-dir-2client.conf.in
+++ b/regress/scripts/bacula-dir-2client.conf.in
@@ -251,6 +251,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -261,6 +262,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/bacula-dir-2d.conf.in b/regress/scripts/bacula-dir-2d.conf.in
index 8a4080bff809c29097e001e8b3cc3582cf3c53b8..515bec1a29863b7aa054a348f40270511ef366e1 100644 (file)
--- a/regress/scripts/bacula-dir-2d.conf.in
+++ b/regress/scripts/bacula-dir-2d.conf.in
@@ -132,6 +132,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -142,6 +143,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/bacula-dir-fifo.conf.in b/regress/scripts/bacula-dir-fifo.conf.in
index 8da99203d435e7047c11a7f2e4dd794f2654f23c..0241e702658a538fdaceb3408059fc093f7e4d14 100644 (file)
--- a/regress/scripts/bacula-dir-fifo.conf.in
+++ b/regress/scripts/bacula-dir-fifo.conf.in
@@ -180,6 +180,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -190,6 +191,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index 9f25ac994b3e37558f9d08c86406bfb708c4ccd6..5bd22d8c757d8e324529e855adfb8929ba2e6acf 100644 (file)
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -193,6 +193,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -203,6 +204,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/bacula-dir-strip.conf.in b/regress/scripts/bacula-dir-strip.conf.in
index 46e89dd6a52fc93fe2b25da8cf6d297aba8a9691..fc1588218debf9d19ab120a934f46a18479c0f59 100644 (file)
--- a/regress/scripts/bacula-dir-strip.conf.in
+++ b/regress/scripts/bacula-dir-strip.conf.in
@@ -186,6 +186,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 5a581bbb8ebd71e045dd95c567762be46a93e36d..f92dadb6e75788f0f3336e285b582939b0725d7d 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -220,6 +220,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -230,6 +231,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/bacula-dir-win32-tape.conf.in
index 082e7ecbf3cb6b00ba6ef305687f374b0e33085f..9216618847ff67099ac7d720f1f59ac8fc6b9aff 100644 (file)
--- a/regress/scripts/bacula-dir-win32-tape.conf.in
+++ b/regress/scripts/bacula-dir-win32-tape.conf.in
@@ -122,6 +122,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -132,6 +133,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/bacula-dir.conf.accurate.in b/regress/scripts/bacula-dir.conf.accurate.in
index 1f6d99f4ce4295e92dc5483339fdf83ed2e54599..2d7cfdecb1956158d51b5a3b2005daab67b117ec 100644 (file)
--- a/regress/scripts/bacula-dir.conf.accurate.in
+++ b/regress/scripts/bacula-dir.conf.accurate.in
@@ -130,6 +130,7 @@ Catalog {
 Messages {
   Name = Standard
   console = all, !skipped, saved
+  catalog = all, !skipped
 }
 
 # Default pool definition

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index 5e57e3c7cf171d6bd547b33eb98b199d4d0c49cc..c4e9151039be353ab4c81a55d11b45f150d137e4 100644 (file)
--- a/regress/scripts/bacula-dir.conf.errors.in
+++ b/regress/scripts/bacula-dir.conf.errors.in
@@ -212,6 +212,7 @@ Catalog {
 Messages {
   Name = Standard
   console = all, !skipped, !saved
+  catalog = all, !skipped
 }
 
 # Default pool definition

diff --git a/regress/scripts/bacula-dir.conf.maxtime.in b/regress/scripts/bacula-dir.conf.maxtime.in
index 5f9d1da94d437fb4ec572f268b94410fb14d6ab0..5223327c76a6a17b7ae1e8ce0ac7ac16e0daeb20 100644 (file)
--- a/regress/scripts/bacula-dir.conf.maxtime.in
+++ b/regress/scripts/bacula-dir.conf.maxtime.in
@@ -115,6 +115,7 @@ Catalog {
 Messages {
   Name = Standard
   console = all, !skipped, !saved
+  catalog = all, !skipped
 }
 
 # Default pool definition

diff --git a/regress/scripts/bacula-dir.conf.regexwhere.in b/regress/scripts/bacula-dir.conf.regexwhere.in
index d1af63cefc832df388a51cd598be691e32cfa24d..b37e9126748d9a0d3a6e0c1240e8470286fdab95 100644 (file)
--- a/regress/scripts/bacula-dir.conf.regexwhere.in
+++ b/regress/scripts/bacula-dir.conf.regexwhere.in
@@ -125,6 +125,7 @@ Catalog {
 Messages {
   Name = Standard
   console = all, !skipped, !saved
+  catalog = all, !skipped
 }
 
 # Default pool definition

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index 617ab8ca17376926b4d8146a4ec79ed69a9abb3f..b6a4042d56d298a8ee517ff0cbaeee4350c89fce 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -59,6 +59,17 @@ Job {
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
 }
 
+Job {
+  Name = "RUN_SUBST"
+  JobDefs = DefaultJob
+  FileSet = FS_TESTJOB
+  RunBeforeJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t"
+  ClientRunBeforeJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t"
+  ClientRunAfterJob = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t"
+  Run After Job = "/bin/echo client_name=%c (@hostname@-fd) dir_name=%d (@hostname@-dir) jobid=%i job=%n type=%t vol=%v status=%e"
+}
+
+
 #After job are after before job
 Job {
   Name = "RUN_DIR_FAILED_BUG"
@@ -235,6 +246,7 @@ Catalog {
 Messages {
   Name = Standard
   console = all, !skipped, !saved
+  catalog = all, !skipped
 }
 
 # Default pool definition

diff --git a/regress/scripts/multi-client-bacula-dir.conf.in b/regress/scripts/multi-client-bacula-dir.conf.in
index fad158694e98c6a935661d1f270ff346c899aba5..fab97c6070f508e7d56f91182d5927ff20b9b6b9 100644 (file)
--- a/regress/scripts/multi-client-bacula-dir.conf.in
+++ b/regress/scripts/multi-client-bacula-dir.conf.in
@@ -343,6 +343,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -355,6 +356,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index af690361505d8895b7174fdab26d1a2281605f4f..736fe99fb824dffda0f7174d7f42c0d7c6ba3c40 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -458,6 +458,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -470,6 +471,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 69833a437486946071aac564f965700a2e366e15..1bb046c398570c0598a1214785b63b43faa59d27 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -279,6 +279,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -291,6 +292,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index cd956931f2071ed154607e983b7f2463d2e2691e..84f1a4420dfa1ae8e9af0d65cd3b9d6272ae337d 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -117,6 +117,7 @@ Messages {
   console = all, !skipped, !terminate
 
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -124,6 +125,7 @@ Messages {
   mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r"
   console = all, !skipped, !terminate, !restored
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/testb-bacula-dir.conf.in b/regress/scripts/testb-bacula-dir.conf.in
index e85afacb75b59148f5c558db14605736c8f0f52b..13828482945e3139bcfef70a0f95be1538a440b0 100644 (file)
--- a/regress/scripts/testb-bacula-dir.conf.in
+++ b/regress/scripts/testb-bacula-dir.conf.in
@@ -121,6 +121,7 @@ Messages {
   console = all, !skipped, !terminate
 
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -128,6 +129,7 @@ Messages {
   mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression: %t %e of %c %l\" %r"
   console = all, !skipped, !terminate, !restored
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/tls-auth-bacula-dir.conf.in b/regress/scripts/tls-auth-bacula-dir.conf.in
index 01aee907c69da5b835a8071d72dfb4f5782110d3..ca99e2ccf93a6f5c58b06718e77574383580e26e 100644 (file)
--- a/regress/scripts/tls-auth-bacula-dir.conf.in
+++ b/regress/scripts/tls-auth-bacula-dir.conf.in
@@ -357,6 +357,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -369,6 +370,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/tls-bacula-dir.conf.in b/regress/scripts/tls-bacula-dir.conf.in
index bd6c965a25d29d2d3c203deb1c4737a18f1088c4..cc179cf6bc64dc8d12b36272e62a0aff89122690 100644 (file)
--- a/regress/scripts/tls-bacula-dir.conf.in
+++ b/regress/scripts/tls-bacula-dir.conf.in
@@ -354,6 +354,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 Messages {
@@ -366,6 +367,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/win32-bacula-dir-tape.conf.in b/regress/scripts/win32-bacula-dir-tape.conf.in
index be11cb6355bad7a91221e65aa685f8a26423ecec..327e9971d971f86b54980d2135be1b4340ce47dc 100644 (file)
--- a/regress/scripts/win32-bacula-dir-tape.conf.in
+++ b/regress/scripts/win32-bacula-dir-tape.conf.in
@@ -136,6 +136,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -146,6 +147,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
     

diff --git a/regress/scripts/win32-bacula-dir.conf.in b/regress/scripts/win32-bacula-dir.conf.in
index 4b8e901da6851f092a7e4715a36aa5faddd36c4f..d8cbe0440788449277be056cb91d9156952c5ab1 100644 (file)
--- a/regress/scripts/win32-bacula-dir.conf.in
+++ b/regress/scripts/win32-bacula-dir.conf.in
@@ -136,6 +136,7 @@ Messages {
 #          also keep all your messages if the scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }
 
 #
@@ -146,6 +147,7 @@ Messages {
 # mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
+  catalog = all, !skipped
 }