resurrect the shallow resubmission examples

diff --git a/org.glite.lb.client/examples/resubmission.l b/org.glite.lb.client/examples/resubmission.l
index 3b8765c..ed6fdcb 100644 (file)
--- a/org.glite.lb.client/examples/resubmission.l
+++ b/org.glite.lb.client/examples/resubmission.l
@@ -3,6 +3,7 @@
 -s LogMonitor,-e EnQueued, --queue="wm_input.fl", --job="job description in receiver language", --result=OK, --reason="detailed description of transfer"
 
 -s WorkloadManager,-e DeQueued, --queue="wm_input.fl", --local_jobid="WM_ID" 
+-s WorkloadManager, -e Resubmission, --result=${RESUB:-WILLRESUB}, --reason="let's try again", --tag=none
 -s WorkloadManager,-e HelperCall, --helper_name="name of the called component",--helper_params="parameters of the call", --src_role=CALLING
 -s WorkloadManager,-e Match,--dest_id="${DESTINATION:-destination CE/queue}"
 -s WorkloadManager,-e HelperReturn, --helper_name="name of the called component",--retval="returned data", --src_role=CALLING

diff --git a/org.glite.lb.client/examples/shallow_and_full_resub.l b/org.glite.lb.client/examples/shallow_and_full_resub.l
index 50f3718..c171348 100644 (file)
--- a/org.glite.lb.client/examples/shallow_and_full_resub.l
+++ b/org.glite.lb.client/examples/shallow_and_full_resub.l
@@ -9,14 +9,16 @@
 
 ! DESTINATION=CE2/queue2
 ! CE_NODE=worker2
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 
 -s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
 -s LogMonitor, -e Resubmission, --result=WILLRESUB, --reason="let's try again", --tag=none
 
 ! DESTINATION=CE3/queue3
 ! CE_NODE=worker3
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 
 -s LogMonitor, -e ReallyRunning, --wn_seq="$EDG_WL_SEQUENCE"
 
@@ -27,7 +29,8 @@
 
 ! DESTINATION=CE2/queue2
 ! CE_NODE=worker2
-:resubmission_deep:
+! RESUB=DEEP
+:resubmission:
 
 #       payload_running=false
 #       destination=CE2/queue2

diff --git a/org.glite.lb.client/examples/shallow_resub_complex.l b/org.glite.lb.client/examples/shallow_resub_complex.l
index 9932d29..ba1201b 100644 (file)
--- a/org.glite.lb.client/examples/shallow_resub_complex.l
+++ b/org.glite.lb.client/examples/shallow_resub_complex.l
@@ -2,6 +2,7 @@
 
 ! DESTINATION=CE1/queue1
 ! CE_NODE=worker1
+! RESUB=SHALLOW
 :running:
 
 -s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
@@ -9,7 +10,8 @@
 
 ! DESTINATION=CE2/queue2
 ! CE_NODE=worker2
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 ! BRANCH_SEQUENCE="$EDG_WL_SEQUENCE"
 
 -s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
@@ -17,7 +19,8 @@
 
 ! DESTINATION=CE3/queue3
 ! CE_NODE=worker3
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 
 -s LogMonitor, -e ReallyRunning, --wn_seq="$BRANCH_SEQUENCE"
 
@@ -34,7 +37,8 @@
 
 ! DESTINATION=CE4/queue4
 ! CE_NODE=worker4
-:resubmission_deep:
+! RESUB=DEEP
+:resubmission:
 
 #       payload_running=false
 #       destination=CE4/queue4

diff --git a/org.glite.lb.client/examples/shallow_resub_simple.l b/org.glite.lb.client/examples/shallow_resub_simple.l
index a0e04d3..134368f 100644 (file)
--- a/org.glite.lb.client/examples/shallow_resub_simple.l
+++ b/org.glite.lb.client/examples/shallow_resub_simple.l
@@ -9,14 +9,16 @@
 
 ! DESTINATION=CE2/queue2
 ! CE_NODE=worker2
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 
 -s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
 -s LogMonitor, -e Resubmission, --result=WILLRESUB, --reason="let's try again", --tag=none
 
 ! DESTINATION=CE3/queue3
 ! CE_NODE=worker3
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 
 -s LogMonitor, -e ReallyRunning, --wn_seq="$EDG_WL_SEQUENCE"
 

diff --git a/org.glite.lb.client/examples/shallow_resub_simple2.l b/org.glite.lb.client/examples/shallow_resub_simple2.l
index a1e17b4..1cb74c2 100644 (file)
--- a/org.glite.lb.client/examples/shallow_resub_simple2.l
+++ b/org.glite.lb.client/examples/shallow_resub_simple2.l
@@ -9,7 +9,8 @@
 
 ! DESTINATION=CE2/queue2
 ! CE_NODE=worker2
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 ! BRANCH_SEQUENCE="$EDG_WL_SEQUENCE"
 
 -s LogMonitor, -e Done, --status_code=FAILED, --reason="reason for the change", --exit_code=141
@@ -17,7 +18,8 @@
 
 ! DESTINATION=CE3/queue3
 ! CE_NODE=worker3
-:resubmission_shallow:
+! RESUB=SHALLOW
+:resubmission:
 
 -s LogMonitor, -e ReallyRunning, --wn_seq="$BRANCH_SEQUENCE"