Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.526.2.22 -r1.526.2.23
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.426.2.22 -r1.426.2.23
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as,v
diff -u -r1.13.2.2 -r1.13.2.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	8 May 2009 05:54:36 -0000	1.13.2.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	3 Jun 2009 06:21:31 -0000	1.13.2.3
@@ -48,6 +48,8 @@
 	
 	private var _extLmsId:String; //external LMS id for tool adapter tools
 
+	private var _mappedServers:Array; // list of possible servers
+	
 	//flags to tell UI which to disable
 	private var _supportsContribute:Boolean;
 	private var _supportsDefineLater:Boolean;
@@ -158,6 +160,13 @@
 					_gradebookToolOutputDefinitionName = _activityEvaluations[0];
 				}
 			}
+
+			if(!StringUtils.isWDDXNull(dto.mappedServers)) {
+				_mappedServers = new Array();
+				for (var i=0; i<dto.mappedServers.length; i++) {
+					_mappedServers.push(dto.mappedServers[i]);
+				}
+			}
 			
 			//TODO: Have the backend send this to flash for all tool activities in the design on startup
 			if(!StringUtils.isWDDXNull(dto.toolOutputDefinitions)) {
@@ -307,10 +316,14 @@
 		return _activityEvaluations;
 	}
 	
+	public function get mappedServers():Array {
+		return _mappedServers;
+	}
+	
 	public function get competenceMappings():Array {
 		return _competenceMappings	
 	}
-	
+
 	//GETTERS + SETTERS
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as,v
diff -u -r1.5 -r1.5.4.1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as	21 Oct 2008 03:09:01 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as	3 Jun 2009 06:21:29 -0000	1.5.4.1
@@ -28,24 +28,24 @@
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.authoring.tk.*;
-import org.lamsfoundation.lams.common.mvc.*;
+import org.lamsfoundation.lams.common.mvc.*;
 import org.lamsfoundation.lams.authoring.cv.*  
 
-import mx.managers.*;
+import mx.managers.*;
 import mx.controls.*;
-import mx.events.*
+import mx.events.*
 /**
 * Authoring view for the toolkit
 * @author DC
 */
-class ToolkitView extends AbstractView {
+class ToolkitView extends AbstractView {
 	private var bkg_pnl:MovieClip;
-	
+	
 	private var toolkitLibraries_sp:MovieClip;
 	private var libraryActivityDesc_txa:TextArea;
 	private var title_lbl:Label;
 	private var title_btn:Button;
-	private var toolTip:MovieClip;
+	private var toolTip:MovieClip;
 	private var _className = "ToolkitView";
 	private var _depth:Number;
 	
@@ -78,10 +78,10 @@
 		_dictionary = Dictionary.getInstance();
 		_tip = new ToolTip();
 		_dictionary.addEventListener('init',Proxy.create(this,setupLabels));
-		_toolkitLoaded = false;
+		_toolkitLoaded = false;
 		//Debugger.log('Running',4,'Constructor','ToolkitView');
 	}
-	
+	
 	/**
 	* Initialisation - sets up the mvc relations ship Abstract view.
 	* Also creates a doLater handler for createToolkit
@@ -107,7 +107,7 @@
 		dragIconListener.onLoadInit = function(dragIcon_mc){
 			//Debugger.log('dragIcon_mc:'+dragIcon_mc,4,'dragIconListener.onLoadInit','ToolkitView');
 			dragIcon_mc._visible = false;
-			//dragIcon_mc = dragIcon_mc;
+			//dragIcon_mc = dragIcon_mc;
 			//Proxy.create(this.cRef,this.cRef['setUpDrag'],dragIcon_mc);
 			this.cRef.setUpDrag(dragIcon_mc);
 			//dragIcon_mc.startDrag(true);
@@ -122,7 +122,7 @@
 		
 		//Application.getInstance().setupAppCM(false)
 		
-		//Create a clip that will wait a frame before dispatching init to give components time to setup
+		//Create a clip that will wait a frame before dispatching init to give components time to setup
 		this.onEnterFrame = createToolkit;
 	}
 	
@@ -149,7 +149,7 @@
 	public function createToolkit():Void {
         //Work out difference between scrollpane and panel (container) width
         _scrollPanelWidthDiff = bkg_pnl.width - toolkitLibraries_sp.width;
-		delete this.onEnterFrame;
+		delete this.onEnterFrame;
 		_depth = this.getNextHighestDepth();
 		
 		
@@ -159,7 +159,7 @@
 		//Debugger.log('_toolkit_mc.desc_panel:'+this.desc_panel,4,'createToolkit','ToolkitView');
 		//layoutToolkit();
 	}
-        
+        
 	
 	/**
 	* Updates state of the tookit, called by the model
@@ -176,7 +176,7 @@
                 break;
             case 'TEMPLATE_ACTIVITY_SELECTED' :
                 updateSelectedTemplateActivity(o);
-                break;
+                break;
             case 'SIZE' : 
                 //set the size
                 setSize(o);
@@ -225,16 +225,16 @@
         this._x = p.x;
         this._y = p.y;
     }
-
+
 	/**
-	* Updates learning library activities.  Creates a templateActivity mc / class for each one.
+	* Updates learning library activities.  Creates a templateActivity mc / class for each one.
 	* NOTE: Each library element contains an array of templateActivities.
 	* templateActivities array may contain just one ToolActivity, or a container activity
 	* like Parralel and corresponding child activities
 	*
 	* @param   o   		The model object that is broadcasting an update.
 	*/
-	private function updateLibraries(o:Observable){
+	private function updateLibraries(o:Observable){
 		Debugger.log('Running:: toolkitLoaded: ' + _toolkitLoaded, Debugger.CRITICAL, 'updateLibraries', 'ToolkitView');
 		if(_toolkitLoaded) return;
 
@@ -246,7 +246,7 @@
 		var tkv = ToolkitView(this);
 		var tkm:ToolkitModel = getModel();
 		//get the hashtable
-		var myLibs:Hashtable = tkm.getToolkitLibraries();
+		var myLibs:Hashtable = tkm.getToolkitLibraries();
 	
 		//loop through the libraries
 		var keys:Array = myLibs.keys();
@@ -264,18 +264,38 @@
 			//Debugger.log('toolActivity '+ta.title+'('+ta.activityID+')',4,'updateLibraries','ToolkitView');
 			
 			// First condition true if is a native lams tool
-			var toolAct = ToolActivity(activities[0]);
+			var toolAct:ToolActivity = ToolActivity(activities[0]);
 			if (toolAct.extLmsId == null || toolAct.extLmsId == undefined) { 
 				Debugger.log('ToolActivity->Native tool: ' + toolAct.title, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
 			}
 			// Second condition true if it is an external tool adapter tool
-			else if (_root.extlmsid != undefined && _root.extlmsid !=null && _root.extlmsid == toolAct.extLmsId){
-				Debugger.log('ToolActivity->External tool, external request: ' + toolAct.title, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
+			else if (_root.extlmsid != undefined && _root.extlmsid != null) {				
+				var mappedServers:Array = toolAct.mappedServers;
+				var found:Boolean = false;
+				
+				Debugger.log('FOR LUKE mappedServers length ' + mappedServers.length, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
+				
+				for (var j = 0; j < mappedServers.length; j++) {
+					Debugger.log('FOR LUKE mappedServers entry ' + mappedServers[j], Debugger.CRITICAL, 'updateLibraries', 'ToolView');
+					if (String(mappedServers[j]) == _root.extlmsid) {
+						found = true;
+					}
+				}
+				
+				// If the extlmsid is not matched against one of the mapped servers, the tool is invalid
+				if (!found) {
+					Debugger.log('ToolActivity->External tool, internal request: ' + toolAct.title, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
+					continue;
+				}
+				// Else the extlmsid is matched against one of the mapped servers, the tool is valid
+				else {
+					Debugger.log('ToolActivity->External tool, external request: ' + toolAct.title, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
+				}
 			}
 			// Else is a tool adapter tool, but the call was not from external server, therefore disable
-			else{
+			else {
+				Debugger.log('ToolActivity->External tool, internal request: ' + toolAct.title, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
 				continue;
-				Debugger.log('ToolActivity->Externale tool, internal request: ' + toolAct.title, Debugger.CRITICAL, 'updateLibraries', 'ToolView');
 			}
 			
 			var templateActivity_mc = toolkitLibraries_sp.content.attachMovie("TemplateActivity","ta_"+learningLib.learningLibraryID,_depth++,{_activities:activities,_toolkitView:tkv, yPos:yPos});
@@ -285,10 +305,10 @@
 			yPos += templateActivity_mc._height;
 						
 			
-		}
+		}
 		_toolkitLoaded = true;
-
-		//toolkitLibraries_sp.refreshPane();
+
+		//toolkitLibraries_sp.refreshPane();
 		
 		
 	}
@@ -313,15 +333,15 @@
 	
 	public function hideToolTip():Void{
 		_tip.CloseToolTip();
-	}
-
+	}
+
 	/**
 	*The currently selected Template Activity
 	* 
 	* @param   o   		The model object that is broadcasting an update.
-	*/
+	*/
 	private function updateSelectedTemplateActivity(o:Observable):Void{
-		//_global.breakpoint();
+		//_global.breakpoint();
 		//gett the model
 		var tkm = ToolkitModel(o);
 		//set the states of TKActs
@@ -443,7 +463,7 @@
 	*/
 	public function getModel():ToolkitModel{
 			return ToolkitModel(model);
-	}
+	}
     /**
     * Returns the default controller for this view (ToolkitController).
 	* Overrides AbstractView.defaultController()