From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Thu, 15 Oct 2009 12:56:12 +0000 (+0000)
Subject: renaming cream sources
X-Git-Tag: glite-security-gss_R_2_0_1_1~42
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8249bf1395bb3cd7061fef7f873660ab36e55f5f;p=jra1mw.git

renaming cream sources
---

diff --git a/org.glite.lb.common/interface/context.h b/org.glite.lb.common/interface/context.h
index 91debbb..5eeb137 100644
--- a/org.glite.lb.common/interface/context.h
+++ b/org.glite.lb.common/interface/context.h
@@ -80,8 +80,8 @@ typedef enum _edg_wll_Source {
 	EDG_WLL_SOURCE_LRMS,
 	EDG_WLL_SOURCE_APPLICATION,
 	EDG_WLL_SOURCE_LB_SERVER,
-	EDG_WLL_SOURCE_CREAM_CORE,
-	EDG_WLL_SOURCE_BLAH,
+	EDG_WLL_SOURCE_CREAM_INTERFACE,
+	EDG_WLL_SOURCE_CREAM_EXECUTOR,
 	EDG_WLL_SOURCE__LAST		/* marker, for internal use only */
 } edg_wll_Source;
 
diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index daccea9..ec15f6a 100644
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -279,8 +279,8 @@ static const char* const srcNames[] = {
 	"LRMS",
 	"Application",
 	"LBServer",
-	"CreamCore",
-	"BLAH",
+	"CREAMInterface",
+	"CREAMExecutor",
 };
 
 edg_wll_Source edg_wll_StringToSource(const char *name)
diff --git a/org.glite.lb.state-machine/src/process_event_cream.c b/org.glite.lb.state-machine/src/process_event_cream.c
index 34d3761..2f89854 100644
--- a/org.glite.lb.state-machine/src/process_event_cream.c
+++ b/org.glite.lb.state-machine/src/process_event_cream.c
@@ -95,7 +95,7 @@ int processEvent_Cream(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict,
 		case EDG_WLL_EVENT_CREAMCALL:
 			if (USABLE(res)) {
 				// BLAH -> LRMS
-				if (e->any.source == EDG_WLL_SOURCE_BLAH && e->CREAMCall.callee == EDG_WLL_SOURCE_LRMS) {
+				if (e->any.source == EDG_WLL_SOURCE_CREAM_EXECUTOR && e->CREAMCall.callee == EDG_WLL_SOURCE_LRMS) {
 					js->pub.state = EDG_WLL_JOB_SCHEDULED;
 					js->pub.cream_state = EDG_WLL_STAT_IDLE;
 				}