Index: lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Attic/Wookie.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml	28 Jul 2009 05:30:22 -0000	1.1
+++ lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml	31 Jul 2009 02:05:28 -0000	1.2
@@ -96,15 +96,6 @@
         />
 
         <property
-            name="allowViewOthersImages"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="allow_view_others_images"
-            length="1"
-        />
-
-        <property
             name="onlineInstructions"
             type="java.lang.String"
             update="true"
@@ -188,37 +179,54 @@
         </set>
 
         <property
-            name="imageFileName"
+            name="reflectInstructions"
             type="java.lang.String"
             update="true"
             insert="true"
-            column="image_file_name"
+            column="reflect_instructions"
+            length="65535"
+        />
+
+        <property
+            name="widgetAuthorUrl"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="widget_author_url"
             length="511"
         />
 
         <property
-            name="imageWidth"
-            type="java.lang.Long"
+            name="widgetHeight"
+            type="java.lang.Integer"
             update="true"
             insert="true"
-            column="image_width"
+            column="widget_height"
         />
 
         <property
-            name="imageHeight"
-            type="java.lang.Long"
+            name="widgetWidth"
+            type="java.lang.Integer"
             update="true"
             insert="true"
-            column="image_height"
+            column="widget_width"
         />
 
         <property
-            name="reflectInstructions"
+            name="widgetMaximise"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="widget_maximise"
+        />
+
+        <property
+            name="widgetIdentifier"
             type="java.lang.String"
             update="true"
             insert="true"
-            column="reflect_instructions"
-            length="65535"
+            column="widget_identifier"
+            length="511"
         />
 
         <!--
Index: lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Attic/WookieUser.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml	28 Jul 2009 05:30:21 -0000	1.1
+++ lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml	31 Jul 2009 02:05:28 -0000	1.2
@@ -90,39 +90,6 @@
             column="entry_uid"
         />
 
-        <property
-            name="imageFileName"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="image_file_name"
-            length="511"
-        />
-
-        <property
-            name="imageHeight"
-            type="java.lang.Long"
-            update="true"
-            insert="true"
-            column="imageHeight"
-        />
-
-        <property
-            name="imageWidth"
-            type="java.lang.Long"
-            update="true"
-            insert="true"
-            column="imageWidth"
-        />
-
-        <property
-            name="imageHidden"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="imageHidden"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-WookieUser.xml
Index: lams_tool_wookie/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/conf/language/lams/ApplicationResources.properties	28 Jul 2009 05:30:18 -0000	1.1
+++ lams_tool_wookie/conf/language/lams/ApplicationResources.properties	31 Jul 2009 02:05:28 -0000	1.2
@@ -7,7 +7,6 @@
 #=================== labels for Wookie Tool =================# 
 
 button.statistics  =Statistics
-appName  =wookie
 error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 button.instructions  =Instructions
 instructions.uploadOfflineInstr  =Offline Instructions File:
@@ -115,11 +114,13 @@
 title.originalImage  =Original Image
 message.imageNotAvailable  =Image not available, either it has not yet been edited or it has been deleted.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
-admin.wookieLanguageCSV  =Enter the comma-separated language key values supported by Wookie
-admin.formError  =The was an error processing the form, please make sure the input text is in comma-separated format: xx,yy,zz
-admin.success  =Configuration successfully saved.
 message.learner.saveWhenFinished  =When you have finished editing your image, click file/save to return to learner.
 monitor.summary.td.addNotebook  =Add Notebook at the end of Wookie Activity
+admin.wookie.apikey  =Wookie API key
+admin.wookie.url  =Wookie URL
+admin.formError  =Please enter both a Wookie API key and your Wookie URL.
+admin.page.title  =Wookie Admin
+admin.return  =Return to Maintain LAMS
+admin.success  =Configuration successfully saved.
 
-
 #======= End labels: Exported 114 labels for en AU =====
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_wookie/conf/language/lams/ApplicationResources_el_GR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties	28 Jul 2009 05:30:18 -0000	1.1
+++ lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties	31 Jul 2009 02:05:28 -0000	1.2
@@ -7,7 +7,6 @@
 #=================== labels for Wookie Tool =================# 
 
 button.statistics  =Statistics
-appName  =wookie
 error.contentrepository  =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
 button.instructions  =Instructions
 instructions.uploadOfflineInstr  =Offline Instructions File:
@@ -115,11 +114,13 @@
 title.originalImage  =Original Image
 message.imageNotAvailable  =Image not available, either it has not yet been edited or it has been deleted.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
-admin.wookieLanguageCSV  =Enter the comma-separated language key values supported by Wookie
-admin.formError  =The was an error processing the form, please make sure the input text is in comma-separated format: xx,yy,zz
 admin.success  =Configuration successfully saved.
 message.learner.saveWhenFinished  =When you have finished editing your image, click file/save to return to learner.
 monitor.summary.td.addNotebook  =Add Notebook at the end of Wookie Activity
+admin.wookie.apikey  =Wookie API key
+admin.wookie.url  =Wookie URL
+admin.formError  =Please enter both a Wookie API key and your Wookie URL.
+admin.page.title  =Wookie Admin
+admin.return  =Return to Maintain LAMS
 
-
 #======= End labels: Exported 114 labels for en AU =====
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_wookie/conf/language/lams/ApplicationResources_es_ES.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_wookie/conf/language/lams/ApplicationResources_mi_NZ.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_wookie/conf/language/lams/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_wookie/conf/language/lams/ApplicationResources_ru_RU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/db/sql/create_lams_tool_wookie.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/db/sql/create_lams_tool_wookie.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/db/sql/create_lams_tool_wookie.sql	28 Jul 2009 05:30:13 -0000	1.1
+++ lams_tool_wookie/db/sql/create_lams_tool_wookie.sql	31 Jul 2009 02:05:28 -0000	1.2
@@ -6,11 +6,70 @@
 drop table if exists tl_lawook10_session;
 drop table if exists tl_lawook10_user;
 drop table if exists tl_lawook10_configuration;
-create table tl_lawook10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wookie_uid bigint, primary key (uid))TYPE=InnoDB;
-create table tl_lawook10_wookie (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, allow_view_others_images bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, image_file_name text, image_width bigint, image_height bigint, reflect_instructions text, primary key (uid))TYPE=InnoDB;
-create table tl_lawook10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wookie_uid bigint, primary key (uid))TYPE=InnoDB;
-create table tl_lawook10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wookie_session_uid bigint, entry_uid bigint, image_file_name text, imageHeight bigint, imageWidth bigint, imageHidden bit, primary key (uid))TYPE=InnoDB;
-create table tl_lawook10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value text, primary key (uid))TYPE=InnoDB;
+create table tl_lawook10_attachment (
+	uid bigint not null auto_increment, 
+	file_version_id bigint, 
+	file_type varchar(255), 
+	file_name varchar(255), 
+	file_uuid bigint, 
+	create_date datetime, 
+	wookie_uid bigint, 
+	primary key (uid)
+)TYPE=InnoDB;
+
+create table tl_lawook10_wookie (
+	uid bigint not null auto_increment, 
+	create_date datetime, 
+	update_date datetime, 
+	create_by bigint, 
+	title varchar(255), 
+	instructions text, 
+	run_offline bit, 
+	lock_on_finished bit, 
+	reflect_on_activity bit, 
+	online_instructions text, 
+	offline_instructions text,
+	content_in_use bit, 
+	define_later bit, 
+	tool_content_id bigint, 
+	reflect_instructions text, 
+	widget_identifier varchar(511),
+	widget_author_url varchar(511),
+	widget_maximise bit,
+	widget_width integer,
+	widget_height integer,
+	primary key (uid)
+)TYPE=InnoDB;
+
+create table tl_lawook10_session (
+	uid bigint not null auto_increment, 
+	session_end_date datetime, 
+	session_start_date datetime, 
+	status integer, 
+	session_id bigint, 
+	session_name varchar(250), 
+	wookie_uid bigint, 
+	primary key (uid)
+)TYPE=InnoDB;
+
+create table tl_lawook10_user (
+	uid bigint not null auto_increment, 
+	user_id bigint, 
+	last_name varchar(255),
+	login_name varchar(255), 
+	first_name varchar(255), 
+	finishedActivity bit, 
+	wookie_session_uid bigint, 
+	entry_uid bigint, 
+	primary key (uid)
+)TYPE=InnoDB;
+
+create table tl_lawook10_configuration (
+	uid bigint not null auto_increment, 
+	config_key varchar(30) unique, 
+	config_value text, primary key (uid)
+)TYPE=InnoDB;
+
 alter table tl_lawook10_attachment add index FK951F889ACB8ADA74 (wookie_uid), add constraint FK951F889ACB8ADA74 foreign key (wookie_uid) references tl_lawook10_wookie (uid);
 alter table tl_lawook10_session add index FKE5C05E7FCB8ADA74 (wookie_uid), add constraint FKE5C05E7FCB8ADA74 foreign key (wookie_uid) references tl_lawook10_wookie (uid);
 alter table tl_lawook10_user add index FK9A39C08236E23005 (wookie_session_uid), add constraint FK9A39C08236E23005 foreign key (wookie_session_uid) references tl_lawook10_session (uid);
@@ -22,11 +81,20 @@
 	config_value
 )
 VALUES(
-	"LanguageCSV",
-	"en,es,fr,de,it,ru,ro,zh-cn,pt-br,sv,pl,th"
+	"APIKEY",
+	"TEST"
 );
 
+INSERT INTO tl_lawook10_configuration (
+	config_key, 
+	config_value
+)
+VALUES(
+	"WOOKIE_SERVER_URL",
+	"http://localhost:8180/wookie/"
+);
 
+
 INSERT INTO tl_lawook10_wookie (
 	title,
 	instructions,
@@ -37,12 +105,7 @@
 	lock_on_finished,
 	content_in_use,
 	define_later,
-	reflect_on_activity,
-	allow_view_others_images,
-	image_width, 
-	image_height,
-	image_file_name
-	
+	reflect_on_activity
 ) 
 VALUES(
 	"Wookie",
@@ -54,10 +117,6 @@
 	0,
 	0,
 	0,
-	0,
-	1,
-	400,
-	450,
-	"blank.jpg"
+	0
 );
 
Index: lams_tool_wookie/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/db/sql/tool_insert.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/db/sql/tool_insert.sql	28 Jul 2009 05:30:13 -0000	1.1
+++ lams_tool_wookie/db/sql/tool_insert.sql	31 Jul 2009 02:05:28 -0000	1.2
@@ -58,5 +58,5 @@
 NOW(),
 NOW(),
 0,
-'tool/lawook10/lawook10admin.do'
+'tool/lawook10/admin.do'
 )
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WidgetData.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WidgetData.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WidgetData.java	31 Jul 2009 02:05:28 -0000	1.1
@@ -0,0 +1,85 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id: WidgetData.java,v 1.1 2009/07/31 02:05:28 lfoxton Exp $ */ 
+package org.lamsfoundation.lams.tool.wookie.dto; 
+ 
+public class WidgetData {
+    
+    private String url;
+    private String identifier;
+    private String title;
+    private String height;
+    private String width;
+    private Boolean maximize;
+    
+    private WidgetData() {}
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getWidth() {
+        return width;
+    }
+
+    public void setWidth(String width) {
+        this.width = width;
+    }
+
+    public Boolean getMaximize() {
+        return maximize;
+    }
+
+    public void setMaximize(Boolean maximize) {
+        this.maximize = maximize;
+    }
+}
+ 
\ No newline at end of file
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java	28 Jul 2009 05:30:17 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -66,14 +66,8 @@
     public Long currentTab;
 
     private String imageFileName;
-    
+
     private String reflectInstructions;
-    
-    boolean allowViewOthersImages;
-    
-    private Long imageWidth;
-    
-    private Long imageHeight;
 
     /* Constructors */
     public WookieDTO() {
@@ -88,10 +82,7 @@
 	this.contentInUse = wookie.isContentInUse();
 	this.reflectOnActivity = wookie.isReflectOnActivity();
 	this.lockOnFinish = wookie.isLockOnFinished();
-	this.imageFileName = wookie.getImageFileName();
 	this.reflectInstructions = wookie.getReflectInstructions();
-	this.allowViewOthersImages = wookie.isAllowViewOthersImages();
-
 	this.onlineInstructionsFiles = new TreeSet<WookieAttachmentDTO>();
 	this.offlineInstructionsFiles = new TreeSet<WookieAttachmentDTO>();
 
@@ -191,11 +182,11 @@
     }
 
     public boolean isReflectOnActivity() {
-        return reflectOnActivity;
+	return reflectOnActivity;
     }
 
     public void setReflectOnActivity(boolean reflectOnActivity) {
-        this.reflectOnActivity = reflectOnActivity;
+	this.reflectOnActivity = reflectOnActivity;
     }
 
     public boolean isLockOnFinish() {
@@ -215,46 +206,22 @@
     }
 
     public String getImageFileName() {
-        return imageFileName;
+	return imageFileName;
     }
 
     public void getImageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
+	this.imageFileName = imageFileName;
     }
 
     public void setImageFileName(String imageFileName) {
-        this.imageFileName = imageFileName;
+	this.imageFileName = imageFileName;
     }
 
     public String getReflectInstructions() {
-        return reflectInstructions;
+	return reflectInstructions;
     }
 
     public void setReflectInstructions(String reflectInstructions) {
-        this.reflectInstructions = reflectInstructions;
+	this.reflectInstructions = reflectInstructions;
     }
-
-    public boolean isAllowViewOthersImages() {
-        return allowViewOthersImages;
-    }
-
-    public void setAllowViewOthersImages(boolean allowViewOthersImages) {
-        this.allowViewOthersImages = allowViewOthersImages;
-    }
-
-    public Long getImageWidth() {
-        return imageWidth;
-    }
-
-    public void setImageWidth(Long imageWidth) {
-        this.imageWidth = imageWidth;
-    }
-
-    public Long getImageHeight() {
-        return imageHeight;
-    }
-
-    public void setImageHeight(Long imageHeight) {
-        this.imageHeight = imageHeight;
-    }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieUserDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieUserDTO.java	28 Jul 2009 05:30:17 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieUserDTO.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -49,29 +49,14 @@
 	
 	public boolean finishedReflection;
 	
-	private Long imageHeight;
-	    
-	private Long imageWidth;
-	
-	private long imageThumbnailWidth;
-	
-	private long imageThumbnailHeight;
-	
-	private boolean imageHidden;
-	
 	public WookieUserDTO(WookieUser user) {
 		this.uid = user.getUid();
 		this.loginName = user.getLoginName();
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
 		this.finishedActivity = user.isFinishedActivity();
 		this.entryUID = user.getEntryUID();
-		this.imageFileName = user.getImageFileName();
 		this.userId = user.getUserId();
-		this.imageHeight = user.getImageHeight();
-		this.imageWidth = user.getImageWidth();
-		this.imageHidden = user.isImageHidden();
-		setThumbnailDimensions();
 	}
 
 	public int compareTo(Object o) {
@@ -159,68 +144,5 @@
 	public Long getUserId() {
 	    return userId;
 	}
-
-	public void setUserId(Long userId) {
-	    this.userId = userId;
-	}
-
-	public Long getImageHeight() {
-	    return imageHeight;
-	}
-
-	public void setImageHeight(Long imageHeight) {
-	    this.imageHeight = imageHeight;
-	}
-
-	public Long getImageWidth() {
-	    return imageWidth;
-	}
-
-	public void setImageWidth(Long imageWidth) {
-	    this.imageWidth = imageWidth;
-	}
-
-	public long getImageThumbnailWidth() {
-	    return imageThumbnailWidth;
-	}
-
-	public void setImageThumbnailWidth(long imageThumbnailWidth) {
-	    this.imageThumbnailWidth = imageThumbnailWidth;
-	}
-
-	public long getImageThumbnailHeight() {
-	    return imageThumbnailHeight;
-	}
-
-	public void setImageThumbnailHeight(long imageThumbnailHeight) {
-	    this.imageThumbnailHeight = imageThumbnailHeight;
-	}
-	
-	public boolean isImageHidden() {
-	    return imageHidden;
-	}
-
-	public void setImageHidden(boolean imageHidden) {
-	    this.imageHidden = imageHidden;
-	}
-
-	// set thumbnail dimensions with a maximum of 100 width or height
-	public void setThumbnailDimensions()
-	{
-	    if (imageWidth != null && imageHeight != null)
-	    if (imageWidth >= imageHeight)
-	    {
-		this.imageThumbnailWidth = 100;
-		double temp = 100.0 / imageWidth.longValue();
-		this.imageThumbnailHeight = (new Double(imageHeight.longValue() * temp)).longValue();
-		 
-	    }
-	    else
-	    {
-		this.imageThumbnailHeight = 100;
-		double temp = 100.0 / imageHeight.longValue();
-		this.imageThumbnailWidth = (new Double(imageWidth.longValue() * temp)).longValue();
-	    }
-	    
-	}
 }
+
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java	28 Jul 2009 05:30:21 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -67,8 +67,6 @@
     private boolean lockOnFinished;
 
     private boolean reflectOnActivity;
-    
-    private boolean allowViewOthersImages;
 
     private String reflectInstructions;
 
@@ -82,15 +80,16 @@
 
     private Long toolContentId;
 
-    private String imageFileName; // Image uploaded for wookie
-    
-    private Long imageWidth;
-    
-    private Long imageHeight;
-
     private Set<WookieAttachment> wookieAttachments;
 
     private Set<WookieSession> wookieSessions;
+    
+    // Wookie parameters
+    String widgetAuthorUrl;
+    Integer widgetHeight;
+    Integer widgetWidth;
+    Boolean widgetMaximise;
+    String widgetIdentifier;
 
     // *********** NON Persisit fields
     private IToolContentHandler toolContentHandler;
@@ -106,7 +105,7 @@
 	    boolean runOffline, boolean lockOnFinished, boolean filteringEnabled, String filterKeywords,
 	    String onlineInstructions, String offlineInstructions, boolean contentInUse, boolean defineLater,
 	    Long toolContentId, String reflectInstructions, Set<WookieAttachment> wookieAttachments,
-	    Set<WookieSession> wookieSessions, String imageFileName, Long imageWidth, Long imageHeight, boolean allowViewOthersImages) {
+	    Set<WookieSession> wookieSessions, String imageFileName, Long imageWidth, Long imageHeight) {
 	this.createDate = createDate;
 	this.updateDate = updateDate;
 	this.createBy = createBy;
@@ -121,11 +120,7 @@
 	this.toolContentId = toolContentId;
 	this.wookieAttachments = wookieAttachments;
 	this.wookieSessions = wookieSessions;
-	this.imageFileName = imageFileName;
 	this.reflectInstructions = reflectInstructions;
-	this.imageHeight = imageHeight;
-	this.imageWidth = imageWidth;
-	this.allowViewOthersImages = allowViewOthersImages;
     }
 
     // Property accessors
@@ -243,18 +238,7 @@
     public void setReflectOnActivity(boolean reflectOnActivity) {
 	this.reflectOnActivity = reflectOnActivity;
     }
-    
-    /**
-     * @hibernate.property column="allow_view_others_images" length="1"
-     */
-    public boolean isAllowViewOthersImages() {
-        return allowViewOthersImages;
-    }
 
-    public void setAllowViewOthersImages(boolean allowViewOthersImages) {
-        this.allowViewOthersImages = allowViewOthersImages;
-    }
-
     /**
      * @hibernate.property column="online_instructions" length="65535"
      * 
@@ -439,53 +423,73 @@
     }
 
     /**
-     * @hibernate.property column="image_file_name" length="511"
-     * 
+     * @hibernate.property column="reflect_instructions" length="65535"
      */
+    public String getReflectInstructions() {
+	return reflectInstructions;
+    }
 
-    public String getImageFileName() {
-	return imageFileName;
+    public void setReflectInstructions(String reflectInstructions) {
+	this.reflectInstructions = reflectInstructions;
     }
 
-    public void setImageFileName(String imageFileName) {
-	this.imageFileName = imageFileName;
+    /**
+     * @hibernate.property column="widget_author_url" length="511"
+     * @return
+     */
+    public String getWidgetAuthorUrl() {
+        return widgetAuthorUrl;
     }
+
+    public void setWidgetAuthorUrl(String widgetAuthorUrl) {
+        this.widgetAuthorUrl = widgetAuthorUrl;
+    }
     
     /**
-     * @hibernate.property column="image_width" 
-     * 
+     * @hibernate.property column="widget_height" 
+     * @return
      */
-
-    public Long getImageWidth() {
-        return imageWidth;
+    public Integer getWidgetHeight() {
+        return widgetHeight;
     }
 
-    public void setImageWidth(Long imageWidth) {
-        this.imageWidth = imageWidth;
+    public void setWidgetHeight(Integer widgetHeight) {
+        this.widgetHeight = widgetHeight;
     }
 
     /**
-     * @hibernate.property column="image_height" 
-     * 
+     * @hibernate.property column="widget_width" 
+     * @return
      */
-    
-    public Long getImageHeight() {
-        return imageHeight;
+    public Integer getWidgetWidth() {
+        return widgetWidth;
     }
 
-    public void setImageHeight(Long imageHeight) {
-        this.imageHeight = imageHeight;
+    public void setWidgetWidth(Integer widgetWidth) {
+        this.widgetWidth = widgetWidth;
     }
 
     /**
-     * @hibernate.property column="reflect_instructions" length="65535"
+     * @hibernate.property column="widget_maximise" 
+     * @return
      */
-    public String getReflectInstructions() {
-	return reflectInstructions;
+    public Boolean getWidgetMaximise() {
+        return widgetMaximise;
     }
 
-    public void setReflectInstructions(String reflectInstructions) {
-	this.reflectInstructions = reflectInstructions;
+    public void setWidgetMaximise(Boolean widgetMaximise) {
+        this.widgetMaximise = widgetMaximise;
     }
 
+    /**
+     * @hibernate.property column="widget_identifier"  length="511"
+     * @return
+     */
+    public String getWidgetIdentifier() {
+        return widgetIdentifier;
+    }
+
+    public void setWidgetIdentifier(String widgetIdentifier) {
+        this.widgetIdentifier = widgetIdentifier;
+    }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieConfigItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieConfigItem.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieConfigItem.java	28 Jul 2009 05:30:21 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieConfigItem.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -30,7 +30,8 @@
 
     private static final long serialVersionUID = 930482766653472636L;
 
-    public static final String KEY_LANGUAGE_CSV = "LanguageCSV";
+    public static final String KEY_API = "APIKEY";
+    public static final String KEY_WOOKIE_URL = "WOOKIE_SERVER_URL";
 
     Long id;
     String configKey;
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieUser.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieUser.java	28 Jul 2009 05:30:21 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/WookieUser.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -59,14 +59,6 @@
 
     private Long entryUID;
 
-    private String imageFileName;
-    
-    private Long imageHeight;
-    
-    private Long imageWidth;
-    
-    private boolean imageHidden;
-
     // Constructors
 
     /** default constructor */
@@ -186,56 +178,6 @@
     }
 
     /**
-     * @hibernate.property column="image_file_name" length="511"
-     * 
-     */
-
-    public String getImageFileName() {
-	return imageFileName;
-    }
-
-    public void setImageFileName(String imageFileName) {
-	this.imageFileName = imageFileName;
-    }
-    
-    /**
-     * @hibernate.property column="image_height
-     * 
-     */
-    public Long getImageHeight() {
-        return imageHeight;
-    }
-
-    public void setImageHeight(Long imageHeight) {
-        this.imageHeight = imageHeight;
-    }
-
-    /**
-     * @hibernate.property column="image_width
-     * 
-     */
-    public Long getImageWidth() {
-        return imageWidth;
-    }
-
-    public void setImageWidth(Long imageWidth) {
-        this.imageWidth = imageWidth;
-    }
-    
-    
-    /**
-     * @hibernate.property column="image_hidden
-     * 
-     */
-    public boolean isImageHidden() {
-        return imageHidden;
-    }
-
-    public void setImageHidden(boolean imageHidden) {
-        this.imageHidden = imageHidden;
-    }
-
-    /**
      * toString
      * 
      * @return String
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java	28 Jul 2009 05:30:18 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/IWookieService.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -184,6 +184,13 @@
      * 
      * @return
      */
-    public String getWookiURL();
+    public String getWookieURL();
+    
+    /**
+     * Get the wookie api key
+     * 
+     * @return
+     */
+    public String getWookieAPIKey();
 
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java	28 Jul 2009 05:30:18 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -210,45 +210,9 @@
 	}
 	Wookie toContent = Wookie.newInstance(fromContent, toContentId, wookieToolContentHandler);
 
-	try {
-	    toContent.setImageFileName(copyImage(toContent));
-	} catch (Exception e) {
-	    WookieService.logger.error("Could not copy image for tool content copy", e);
-	    throw new ToolException(e);
-	}
-
 	wookieDAO.saveOrUpdate(toContent);
     }
 
-    public String copyImage(Wookie toContent) throws Exception {
-
-	String realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR
-		+ File.separator + "images" + File.separator + "wookie";
-
-	File existingFile = new File(realBaseDir + File.separator + toContent.getImageFileName());
-
-	if (existingFile.exists() && existingFile.canRead()) {
-	    String ext = getFileExtension(toContent.getImageFileName());
-	    String newFileName = FileUtil.generateUniqueContentFolderID() + ext;
-
-	    String newFilePath = realBaseDir + File.separator + newFileName;
-	    copyFile(existingFile, newFilePath);
-	    return newFileName;
-	} else {
-	    // if cant find or read the file, just copy the default image file
-	    if (existingFile.exists() && existingFile.canRead()) {
-		File existingFile2 = new File(getDefaultContent().getImageFileName());
-		String ext = getFileExtension(toContent.getImageFileName());
-		String newFileName = FileUtil.generateUniqueContentFolderID() + ext;
-		String newFilePath = realBaseDir + File.separator + newFileName;
-		copyFile(existingFile2, newFilePath);
-		return newFileName;
-	    } else {
-		throw new WookieException("Could not find file to copy");
-	    }
-	}
-    }
-
     public void copyFile(File srcFile, String destPath) throws Exception {
 	if (srcFile.exists() && srcFile.canRead()) {
 	    File newFile = new File(destPath);
@@ -310,31 +274,6 @@
 	wookie.setToolContentHandler(null);
 	wookie.setWookieSessions(null);
 
-	// bundling the author image in export
-	try {
-	    if (wookie.getImageFileName() != null) {
-		File imageFile = new File(WookieConstants.LAMS_PIXLR_BASE_DIR + File.separator
-			+ wookie.getImageFileName());
-		if (imageFile.exists()) {
-
-		    String ext = getFileExtension(wookie.getImageFileName());
-
-		    String tempDir = rootPath + File.separator + toolContentId.toString();
-		    File tempDirFile = new File(tempDir);
-		    if (!tempDirFile.exists()) {
-			tempDirFile.mkdirs();
-		    }
-		    String newFilePath = tempDir + File.separator + WookieService.EXPORT_IMAGE_FILE_NAME + ext;
-
-		    copyFile(imageFile, newFilePath);
-		    wookie.setImageFileName(WookieService.EXPORT_IMAGE_FILE_NAME + ext);
-		}
-	    }
-
-	} catch (Exception e) {
-	    WookieService.logger.error("Could not export wookie image, image may be missing in export", e);
-	}
-
 	Set<WookieAttachment> atts = wookie.getWookieAttachments();
 	for (WookieAttachment att : atts) {
 	    att.setWookie(null);
@@ -372,22 +311,6 @@
 	    wookie.setToolContentId(toolContentId);
 	    wookie.setCreateBy(new Long(newUserUid.longValue()));
 
-	    // Copying the image file into lams_www.war/images/wookie
-	    File imageFile = new File(toolContentPath + File.separator + wookie.getImageFileName());
-
-	    if (imageFile.exists() && imageFile.canRead()) {
-
-		String newFileName = FileUtil.generateUniqueContentFolderID()
-			+ getFileExtension(wookie.getImageFileName());
-
-		String newFilePath = WookieConstants.LAMS_PIXLR_BASE_DIR + File.separator + newFileName;
-
-		copyFile(imageFile, newFilePath);
-		wookie.setImageFileName(newFileName);
-	    } else {
-		wookie.setImageFileName(getDefaultContent().getImageFileName());
-	    }
-
 	    wookieDAO.saveOrUpdate(wookie);
 	} catch (ImportToolContentException e) {
 	    throw new ToolException(e);
@@ -422,6 +345,11 @@
 	}
 	return getWookieOutputFactory().getToolOutputDefinitions(wookie, definitionType);
     }
+    
+    @SuppressWarnings("unchecked")
+    public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
+	return getWookieOutputFactory().getSupportedDefinitionClasses(definitionType);
+    }
 
     /* ********** IWookieService Methods ********************************* */
 
@@ -619,9 +547,23 @@
 	wookieConfigItemDAO.saveOrUpdate(item);
     }
     
-    public String getWookiURL() {
-	return "http://172.20.100.162:8180/wookie";
+    public String getWookieURL() {
+	String url = null;
+	WookieConfigItem urlItem = wookieConfigItemDAO.getConfigItemByKey(WookieConfigItem.KEY_WOOKIE_URL);
+	if (urlItem != null) {
+	    url = urlItem.getConfigValue();
+	}
+	return url;
     }
+    
+    public String getWookieAPIKey() {
+	String url = null;
+	WookieConfigItem apiItem = wookieConfigItemDAO.getConfigItemByKey(WookieConfigItem.KEY_API);
+	if (apiItem != null) {
+	    url = apiItem.getConfigValue();
+	}
+	return url;
+    }
 
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java	28 Jul 2009 05:30:24 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -51,6 +51,7 @@
     public static final String ATTR_SESSION_MAP = "sessionMap";
     public static final String ATTR_WIDGET_LIST = "widgetList";
     public static final String ATTR_WIDGET_PAGES = "widgetPages";
+    public static final String ATTR_WIDGET_URL = "widgetURL";
 
     // Parameter names
     public static final String PARAM_PARENT_PAGE = "parentPage";
@@ -81,12 +82,32 @@
     public static final String PARAM_PAGE_COUNT = "pageCount";
     public static final String PARAM_PAGE_NUMBER = "pageNumber";
     
+    public static final String PARAM_KEY_REQUEST_ID = "requestid";
+    public static final String PARAM_KEY_API_KEY = "api_key";
+    public static final String PARAM_KEY_SERVICE_TYPE = "servicetype";
+    public static final String PARAM_KEY_WIDGIT_ID = "widgetid";
+    public static final String PARAM_KEY_USER_ID = "userid";
+    public static final String PARAM_KEY_SHARED_DATA_KEY = "shareddatakey";
+    public static final String PARAM_KEY_PARTICIPANT_ID = "participant_id";
+    public static final String PARAM_KEY_PARTICIPANT_DISPLAY_NAME = "participant_display_name";
+    public static final String PARAM_KEY_PARTICIPANT_THUMBNAIL_URL = "participant_thumbnail_url";
+    public static final String PARAM_KEY_PROPERTY_NAME = "propertyname";
+    public static final String PARAM_KEY_PROPERTY_VALUE = "propertyvalue";
+    
+    public static final String PARAM_VALUE_GET_WIDGET= "getwidget";
+    public static final String PARAM_VALUE_ADD_PARTICIPANT = "addparticipant";
+    public static final String PARAM_VALUE_SET_PERSONAL_PROPERTY = "setpersonalproperty";
+    public static final String PARAM_VALUE_PROPERTY_NAME_MODERATOR = "moderator";
+    public static final String PARAM_VALUE_PROPERTY_VALUE_TRUE = "true";
+    
     public static final String XML_WIDGETS = "widgets";
     public static final String XML_WIDGET = "widget";
     public static final String XML_IDENTIFIER = "identifier";
     public static final String XML_TITLE = "title";
     public static final String XML_DESCRIPTION = "description";
     public static final String XML_ICON = "icon";
     public static final String XML_PARAMETER = "parameter";
-
+    public static final String XML_MESSAGE = "message";
+    public static final String XML_COMPLETED = "completed";
+    
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieUtil.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieUtil.java	28 Jul 2009 05:30:24 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieUtil.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -28,6 +28,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,8 +39,10 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.wookie.dto.WidgetData;
 import org.lamsfoundation.lams.tool.wookie.dto.WidgetDefinition;
 import org.lamsfoundation.lams.tool.wookie.web.actions.AuthoringAction;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -48,6 +52,8 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import com.thoughtworks.xstream.XStream;
+
 public class WookieUtil {
 
     private static Logger logger = Logger.getLogger(AuthoringAction.class);
@@ -109,40 +115,215 @@
 	}
 	return widgetDefinitions;
     }
-    
-    public static int getWidgetCount(String url) throws DOMException, IOException,
-            ParserConfigurationException, SAXException, Exception {
-        
-        // add the relative url for the widget list
-        url += WookieConstants.RELATIVE_URL_WIDGET_LIST;
-        
-        // add required parameters
-        HashMap<String, String> params = new HashMap<String, String>();
-        params.put(WookieConstants.PARAM_ALL, WookieConstants.PARAM_TRUE);
-        
-        // Make the request to the wookie server
-        InputStream is = WebUtil.getResponseInputStreamFromExternalServer(url, params);
-        
-        // Reading the response from the wookie server
-        String xml = convertStreamToString(is);
-        if (xml == null) {
-            logger.error("Got null xml from url: " + url);
-            return 0;
-        }
-        
-        // Parsing the xml document containing the widget definitions
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        Document document = db.parse(new InputSource(new StringReader(xml)));
-        NodeList widgetList = document.getElementsByTagName(WookieConstants.XML_WIDGET);
-        
-        if (widgetList != null) {
-            return widgetList.getLength();
-        }
-        return 0;
+
+    public static int getWidgetCount(String url) throws DOMException, IOException, ParserConfigurationException,
+	    SAXException, Exception {
+
+	// add the relative url for the widget list
+	url += WookieConstants.RELATIVE_URL_WIDGET_LIST;
+
+	// add required parameters
+	HashMap<String, String> params = new HashMap<String, String>();
+	params.put(WookieConstants.PARAM_ALL, WookieConstants.PARAM_TRUE);
+
+	// Make the request to the wookie server
+	InputStream is = WebUtil.getResponseInputStreamFromExternalServer(url, params);
+
+	// Reading the response from the wookie server
+	String xml = convertStreamToString(is);
+	if (xml == null) {
+	    logger.error("Got null xml from url: " + url);
+	    return 0;
+	}
+
+	// Parsing the xml document containing the widget definitions
+	DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+	DocumentBuilder db = dbf.newDocumentBuilder();
+	Document document = db.parse(new InputSource(new StringReader(xml)));
+	NodeList widgetList = document.getElementsByTagName(WookieConstants.XML_WIDGET);
+
+	if (widgetList != null) {
+	    return widgetList.getLength();
+	}
+	return 0;
     }
 
-    public static String convertStreamToString(InputStream is) throws IOException {
+    public static String getWidget(String url, String apiKey, String widgetIdentifier, UserDTO user, String sharedDataKey, boolean isModerator)
+	    throws Exception {
+
+	if (url == null || apiKey == null || widgetIdentifier == null || user == null || sharedDataKey == null) {
+	    return null;
+	}
+
+	HashMap<String, String> params = new HashMap<String, String>();
+	params.put(WookieConstants.PARAM_KEY_WIDGIT_ID, URLEncoder.encode(widgetIdentifier, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_USER_ID, URLEncoder.encode(user.getUserID().toString(), "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_SHARED_DATA_KEY, URLEncoder.encode(sharedDataKey, "UTF8"));
+
+	InputStream is = requestWookieServlet(url, apiKey, WookieConstants.PARAM_VALUE_GET_WIDGET, params);
+	String widgetXML = convertStreamToString(is);
+	String displayName = user.getFirstName() + " " + user.getLastName();
+	
+	
+	// Add the participant
+	String participantAddedXML = addParticipant(url, apiKey, widgetIdentifier, user.getUserID().toString(), sharedDataKey, user.getUserID().toString(), displayName, null);
+	if (!checkCompleted(participantAddedXML)) {
+	    throw new WookieException("Attempt to add participant failed: " + participantAddedXML);
+	}
+	
+
+	// If required, set the moderator property
+	if (isModerator) {
+	    String propertyAddedXML = addProperty(url, apiKey, widgetIdentifier, user.getUserID().toString(), sharedDataKey, user.getUserID().toString(), displayName, null, WookieConstants.PARAM_VALUE_PROPERTY_NAME_MODERATOR, WookieConstants.PARAM_VALUE_PROPERTY_VALUE_TRUE);
+	    if (!checkCompleted(propertyAddedXML)) {
+		throw new WookieException("Attempt to add property failed: " + propertyAddedXML);
+	    }
+	    		
+	}
+	
+	return widgetXML;
+
+    }
+
+    /**
+     * 
+     * @param url
+     * @param apiKey
+     * @param widgetIdentifier
+     * @param userId
+     * @param sharedDataKey
+     * @param participantId
+     * @param participantDisplayName
+     * @param participantThumbnailURL
+     * @return
+     * @throws Exception 
+     * @throws Exception
+     */
+    public static String addParticipant(String url, String apiKey, String widgetIdentifier, String userId,
+	    String sharedDataKey, String participantId, String participantDisplayName, String participantThumbnailURL) throws Exception
+	     {
+	if (url == null || apiKey == null || widgetIdentifier == null || userId == null || sharedDataKey == null) {
+	    throw new WookieException("Parameters missing in addParticipant call");
+	}
+
+	HashMap<String, String> params = new HashMap<String, String>();
+	params.put(WookieConstants.PARAM_KEY_WIDGIT_ID, URLEncoder.encode(widgetIdentifier, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_USER_ID, URLEncoder.encode(userId, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_SHARED_DATA_KEY, URLEncoder.encode(sharedDataKey, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_PARTICIPANT_ID, URLEncoder.encode(participantId, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_PARTICIPANT_DISPLAY_NAME, URLEncoder
+		.encode(participantDisplayName, "UTF8"));
+	if (participantThumbnailURL != null) {
+	    params.put(WookieConstants.PARAM_KEY_PARTICIPANT_THUMBNAIL_URL, URLEncoder.encode(participantThumbnailURL,
+		"UTF8"));
+	}
+	
+
+	InputStream is = requestWookieServlet(url, apiKey, WookieConstants.PARAM_VALUE_ADD_PARTICIPANT, params);
+	String xml = convertStreamToString(is);
+	return xml;
+    }
+
+    /**
+     * 
+     * 
+     * 
+     * @param url
+     * @param apiKey
+     * @param widgetIdentifier
+     * @param userId
+     * @param sharedDataKey
+     * @param participantId
+     * @param participantDisplayName
+     * @param participantThumbnailURL
+     * @return
+     * @throws Exception 
+     * @throws Exception
+     */
+    public static String addProperty(String url, String apiKey, String widgetIdentifier, String userId,
+	    String sharedDataKey, String participantId, String participantDisplayName, String participantThumbnailURL,
+	    String propertyName, String propertyValue) throws Exception {
+	if (url == null || apiKey == null || widgetIdentifier == null || userId == null || sharedDataKey == null) {
+	    throw new WookieException("Parameters missing in addProperty call");
+	}
+
+	HashMap<String, String> params = new HashMap<String, String>();
+	params.put(WookieConstants.PARAM_KEY_WIDGIT_ID, URLEncoder.encode(widgetIdentifier, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_USER_ID, URLEncoder.encode(userId, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_SHARED_DATA_KEY, URLEncoder.encode(sharedDataKey, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_PARTICIPANT_ID, URLEncoder.encode(participantId, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_PARTICIPANT_DISPLAY_NAME, URLEncoder
+		.encode(participantDisplayName, "UTF8"));
+	if (participantThumbnailURL != null) {
+	    params.put(WookieConstants.PARAM_KEY_PARTICIPANT_THUMBNAIL_URL, URLEncoder.encode(participantThumbnailURL,
+		"UTF8"));
+	}
+	params.put(WookieConstants.PARAM_KEY_PROPERTY_NAME, URLEncoder.encode(propertyName, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_PROPERTY_VALUE, URLEncoder.encode(propertyValue, "UTF8"));
+
+	InputStream is = requestWookieServlet(url, apiKey, WookieConstants.PARAM_VALUE_SET_PERSONAL_PROPERTY, params);
+	String xml = convertStreamToString(is);
+	return xml;
+    }
+
+    /**
+     * All requests to the wooke servlet go through this method
+     * 
+     * @param url
+     * @param apiKey
+     * @param requestId
+     * @param params
+     * @return
+     * @throws Exception
+     */
+    public static InputStream requestWookieServlet(String url, String apiKey, String requestId,
+	    HashMap<String, String> params) throws Exception {
+	// Adding required params to hashmap
+	params.put(WookieConstants.PARAM_KEY_API_KEY, URLEncoder.encode(apiKey, "UTF8"));
+	params.put(WookieConstants.PARAM_KEY_REQUEST_ID, URLEncoder.encode(requestId, "UTF8"));
+
+	return WebUtil.getResponseInputStreamFromExternalServer(url, params);
+    }
+
+    /**
+     * Checks the resulting xml for "<message>completed</message>"
+     * 
+     * @param xml
+     * @return
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     * @throws Exception
+     */
+    private static boolean checkCompleted(String xml) throws ParserConfigurationException, SAXException, IOException {
+
+	if (xml != null) {
+
+	    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+	    DocumentBuilder db = dbf.newDocumentBuilder();
+	    Document document = db.parse(new InputSource(new StringReader(xml)));
+	    NodeList result = document.getElementsByTagName(WookieConstants.XML_MESSAGE);
+
+	    if (result != null) {
+		Node resultNode = result.item(0);
+		if (resultNode != null && resultNode.getTextContent().equals(WookieConstants.XML_COMPLETED)) {
+		    return true;
+		}
+	    }
+	    logger.error("Recieved bad result when calling wookie server: " + xml);
+	}
+
+	return false;
+    }
+
+    /**
+     * Get a string response from an input stream
+     * 
+     * @param is
+     * @return
+     * @throws IOException
+     */
+    private static String convertStreamToString(InputStream is) throws IOException {
 	BufferedReader reader = new BufferedReader(new InputStreamReader(is));
 	StringBuilder sb = new StringBuilder();
 	String line = null;
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AdminAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AdminAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AdminAction.java	28 Jul 2009 05:30:24 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AdminAction.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -16,8 +16,8 @@
  * @author
  * @version
  * 
- * @struts.action path="/lawook10admin" parameter="dispatch" scope="request"
- *                name="lawook10AdminForm" validate="false"
+ * @struts.action path="/admin" parameter="dispatch" scope="request"
+ *                name="wookieadminform" validate="false"
  * 
  * @struts.action-forward name="config" path="/pages/admin/config.jsp"
  */
@@ -33,10 +33,16 @@
 
 	AdminForm adminForm = (AdminForm) form;
 
-	WookieConfigItem wookieKey = wookieService.getConfigItem(WookieConfigItem.KEY_LANGUAGE_CSV);
-	if (wookieKey != null)
-	    adminForm.setLanguagesCSV(wookieKey.getConfigValue());
+	WookieConfigItem wookieKey = wookieService.getConfigItem(WookieConfigItem.KEY_API);
+	if (wookieKey != null) {
+	    adminForm.setApiKey(wookieKey.getConfigValue());
+	}
 
+	WookieConfigItem wookieUrl = wookieService.getConfigItem(WookieConfigItem.KEY_WOOKIE_URL);
+	if (wookieUrl != null) {
+	    adminForm.setWookieServerUrl(wookieUrl.getConfigValue());
+	}
+
 	request.setAttribute("error", false);
 	return mapping.findForward("config");
     }
@@ -45,15 +51,20 @@
 	    HttpServletResponse response) {
 	AdminForm adminForm = (AdminForm) form;
 
-	if (adminForm.getLanguagesCSV() != null && !adminForm.getLanguagesCSV().equals("")) {
-	    // set up mdlForumService
+	if (adminForm.getApiKey() != null && !adminForm.getApiKey().equals("")
+		&& adminForm.getWookieServerUrl() != null && !adminForm.getWookieServerUrl().equals("")) {
+
 	    if (wookieService == null) {
 		wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
 	    }
 
-	    WookieConfigItem wookieKey = wookieService.getConfigItem(WookieConfigItem.KEY_LANGUAGE_CSV);
-	    wookieKey.setConfigValue(adminForm.getLanguagesCSV());
+	    WookieConfigItem wookieKey = wookieService.getConfigItem(WookieConfigItem.KEY_API);
+	    wookieKey.setConfigValue(adminForm.getApiKey());
 	    wookieService.saveOrUpdateWookieConfigItem(wookieKey);
+	    
+	    WookieConfigItem wookieUrl = wookieService.getConfigItem(WookieConfigItem.KEY_WOOKIE_URL);
+	    wookieUrl.setConfigValue(adminForm.getWookieServerUrl());
+	    wookieService.saveOrUpdateWookieConfigItem(wookieUrl);
 
 	    request.setAttribute("savedSuccess", true);
 	    return mapping.findForward("config");
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java	28 Jul 2009 05:30:23 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -27,8 +27,6 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -39,7 +37,6 @@
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -53,6 +50,7 @@
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.wookie.dto.WidgetData;
 import org.lamsfoundation.lams.tool.wookie.dto.WidgetDefinition;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
 import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment;
@@ -62,17 +60,19 @@
 import org.lamsfoundation.lams.tool.wookie.util.WookieException;
 import org.lamsfoundation.lams.tool.wookie.util.WookieUtil;
 import org.lamsfoundation.lams.tool.wookie.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
-import org.w3c.dom.DOMException;
-import org.xml.sax.SAXException;
 
+import com.thoughtworks.xstream.XStream;
+
 /**
  * @author
  * @version
@@ -81,7 +81,8 @@
  *                scope="request" validate="false"
  * 
  * @struts.action-forward name="success" path="tiles:/authoring/main"
- * @struts.action-forward name="widgetList" path="/pages/authoring/widgetList.jsp"
+ * @struts.action-forward name="widgetList"
+ *                        path="/pages/authoring/widgetList.jsp"
  * @struts.action-forward name="message_page" path="tiles:/generic/message"
  */
 public class AuthoringAction extends LamsDispatchAction {
@@ -127,22 +128,30 @@
 	if (wookieService == null) {
 	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
 	}
-	
+
+	String wookieUrl = wookieService.getWookieURL();
+	if (wookieUrl == null) {
+	    // TODO: Forward to error, citing that wookie is not configured properly
+	}
+
 	// Get the widget count
 	try {
-	    int widgetCount = WookieUtil.getWidgetCount(wookieService.getWookiURL());    
+	    int widgetCount = WookieUtil.getWidgetCount(wookieUrl);
 	    if (widgetCount > 0) {
 		int pages = 1;
 		float pagesFloat = new Float(widgetCount) / WookieConstants.WIDGETS_PER_PAGE;
 		if (pagesFloat > 1) {
-			
-			pages = (new Float(Math.ceil(pagesFloat))).intValue();
-		    }
-	    
-		 request.setAttribute(WookieConstants.ATTR_WIDGET_PAGES, pages);
-	    } 
+
+		    pages = (new Float(Math.ceil(pagesFloat))).intValue();
+		}
+
+		request.setAttribute(WookieConstants.ATTR_WIDGET_PAGES, pages);
+	    }
 	} catch (Exception e) {
 	    log.error("Problem reading xml from wookie server.", e);
+	    
+	    // TODO: Handle failed call to wookie server
+	    
 	    throw new WookieException(e);
 	}
 
@@ -163,19 +172,6 @@
 	    wookieService.saveOrUpdateWookie(wookie);
 	}
 
-	String imageUrl = WookieConstants.LAMS_WWW_PIXLR_FOLDER_URL;
-	Boolean imageExists = false;
-	if ((wookie.getImageFileName() != null && !wookie.getImageFileName().equals(""))) {
-	    imageUrl += wookie.getImageFileName();
-	    if (!wookie.getImageFileName().equals(wookieService.getDefaultContent().getImageFileName())) {
-		imageExists = true;
-	    }
-	} else {
-	    imageUrl += wookieService.getDefaultContent().getImageFileName();
-	}
-	request.setAttribute("imageURL", imageUrl);
-	request.setAttribute("imageExists", imageExists);
-
 	// Set up the authForm.
 	updateAuthForm(authForm, wookie);
 	authForm.setToolContentID(toolContentID);
@@ -185,7 +181,7 @@
 	    authForm.setMode("");
 	}
 	authForm.setContentFolderID(contentFolderID);
-
+	
 	// Set up sessionMap
 	SessionMap<String, Object> map = createSessionMap(wookie, getAccessMode(request), contentFolderID,
 		toolContentID);
@@ -201,12 +197,21 @@
     public ActionForward getWidgets(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws WookieException {
 
+	// set up wookieService
+	if (wookieService == null) {
+	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
+	}
+
 	Integer pageNumber = WebUtil.readIntParam(request, WookieConstants.PARAM_PAGE_NUMBER);
-	//Integer pageCount = WebUtil.readIntParam(request, WookieConstants.PARAM_PAGE_COUNT);
 
 	// Fetch all the available wookie widgets
 	try {
-	    List<WidgetDefinition> widgetDefinitions = WookieUtil.getWidgetDefinitions(wookieService.getWookiURL());
+	    String wookieUrl = wookieService.getWookieURL();
+	    if (wookieUrl == null) {
+		// TODO: Forward to error, citing that wookie is not configured properly
+	    }
+
+	    List<WidgetDefinition> widgetDefinitions = WookieUtil.getWidgetDefinitions(wookieUrl);
 	    List<WidgetDefinition> cutDownWidgetDefinitions = null;
 
 	    int startIndex = WookieConstants.WIDGETS_PER_PAGE * (pageNumber - 1);
@@ -223,13 +228,50 @@
 	    }
 	    request.setAttribute(WookieConstants.ATTR_WIDGET_LIST, cutDownWidgetDefinitions);
 	    return mapping.findForward("widgetList");
-	    
+
 	} catch (Exception e) {
 	    log.error("Problem reading xml from wookie server.", e);
 	    throw new WookieException(e);
 	}
     }
 
+    public ActionForward initiateWidget(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws WookieException {
+	try {
+	    // set up wookieService
+	    if (wookieService == null) {
+		wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
+	    }
+
+	    String wookieUrl = wookieService.getWookieURL();
+	    String wookieKey = wookieService.getWookieAPIKey();
+	    String wookieIdentifier = WebUtil.readStrParam(request, WookieConstants.PARAM_KEY_WIDGIT_ID);
+	    Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+	    if (wookieUrl == null || wookieKey == null) {
+		// TODO: Forward to error, citing that wookie is not configured properly
+	    }
+	    wookieUrl += WookieConstants.RELATIVE_URL_WIDGET_SERVICE;
+
+	    String returnXML = WookieUtil.getWidget(wookieUrl, wookieKey, wookieIdentifier, getUser(), toolContentID
+		    .toString(), true);
+
+	    // Get object from xml
+	    //XStream xstream = new XStream();
+	    //WidgetData data = (WidgetData)xstream.fromXML(returnXML);
+
+	    // retrieving Wookie with given toolContentID
+	    //Wookie wookie = wookieService.getWookieByContentId(toolContentID);
+
+	    this.writeResponse(response, "text/xml;charset=utf-8", "utf-8", returnXML);
+
+	} catch (Exception e) {
+	    log.error("Problem intitiation widget" + e);
+	    throw new WookieException(e);
+	}
+	return null;
+    }
+
     public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws WookieException {
 	// TODO need error checking.
@@ -241,33 +283,7 @@
 
 	// get wookie content.
 	Wookie wookie = wookieService.getWookieByContentId((Long) map.get(AuthoringAction.KEY_TOOL_CONTENT_ID));
-	ActionErrors errors = new ActionErrors();
-	;
 
-	try {
-	    // TODO: Need to check if this is an edit, if so, delete the old image
-	    if (authForm.getExistingImageFileName().equals(WookieConstants.DEFAULT_IMAGE_FILE_NAME)
-		    || authForm.getExistingImageFileName().trim().equals("")) {
-		errors = validateImageFile(authForm);
-
-		if (!errors.isEmpty()) {
-		    this.addErrors(request, errors);
-		    updateAuthForm(authForm, wookie);
-		    if (mode != null) {
-			authForm.setMode(mode.toString());
-		    } else {
-			authForm.setMode("");
-		    }
-		    return mapping.findForward("success");
-		}
-		uploadFormImage(authForm, wookie);
-	    }
-	} catch (Exception e) {
-	    logger.error("Problem uploading image", e);
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(WookieConstants.ERROR_MSG_FILE_UPLOAD));
-	    //throw new WookieException("Problem uploading image", e);
-	}
-
 	// update wookie content using form inputs.
 	updateWookie(wookie, authForm, mode);
 
@@ -480,7 +496,11 @@
 	    wookie.setLockOnFinished(authForm.isLockOnFinished());
 	    wookie.setReflectOnActivity(authForm.isReflectOnActivity());
 	    wookie.setReflectInstructions(authForm.getReflectInstructions());
-	    wookie.setAllowViewOthersImages(authForm.isAllowViewOthersImages());
+	    wookie.setWidgetAuthorUrl(authForm.getWidgetAuthorUrl());
+	    wookie.setWidgetHeight(authForm.getWidgetHeight());
+	    wookie.setWidgetWidth(authForm.getWidgetWidth());
+	    wookie.setWidgetMaximise(authForm.getWidgetMaximise());
+	    wookie.setWidgetIdentifier(authForm.getWidgetIdentifier());
 	}
     }
 
@@ -498,15 +518,14 @@
 	authForm.setOfflineInstruction(wookie.getOfflineInstructions());
 	authForm.setLockOnFinished(wookie.isLockOnFinished());
 	authForm.setReflectOnActivity(wookie.isReflectOnActivity());
-	authForm.setExistingImageFileName(wookie.getImageFileName());
 	authForm.setReflectInstructions(wookie.getReflectInstructions());
-	authForm.setAllowViewOthersImages(wookie.isAllowViewOthersImages());
-
-	if (wookie.getImageFileName() == null || wookie.getImageFileName().trim().equals("")) {
-	    authForm.setFileName(WookieConstants.DEFAULT_IMAGE_FILE_NAME);
-	} else {
-	    authForm.setFileName(wookie.getImageFileName());
-	}
+	
+	// Set the wookie params
+	authForm.setWidgetAuthorUrl(wookie.getWidgetAuthorUrl());
+	authForm.setWidgetHeight(wookie.getWidgetHeight());
+	authForm.setWidgetWidth(wookie.getWidgetWidth());
+	authForm.setWidgetMaximise(wookie.getWidgetMaximise());
+	authForm.setWidgetIdentifier(wookie.getWidgetIdentifier());
     }
 
     /**
@@ -587,114 +606,7 @@
 	return (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
     }
 
-    /**
-     * Validate imageGallery item.
-     * 
-     * @param itemForm
-     * @return
-     */
-    private ActionErrors validateImageFile(AuthoringForm itemForm) {
-	ActionErrors errors = new ActionErrors();
-
-	// validate file size
-	FileValidatorUtil.validateFileSize(itemForm.getFile(), true, errors);
-	// for edit validate: file already exist
-	if (!itemForm.isHasFile()
-		&& ((itemForm.getFile() == null) || StringUtils.isEmpty(itemForm.getFile().getFileName()))) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(WookieConstants.ERROR_MSG_FILE_BLANK));
-	}
-
-	// check for allowed format : gif, png, jpg
-	if (itemForm.getFile() != null) {
-	    String contentType = itemForm.getFile().getContentType();
-	    if (StringUtils.isEmpty(contentType)
-		    || !(contentType.equals("image/gif") || contentType.equals("image/png")
-			    || contentType.equals("image/jpg") || contentType.equals("image/jpeg") || contentType
-			    .equals("image/pjpeg"))) {
-		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-			WookieConstants.ERROR_MSG_NOT_ALLOWED_FORMAT));
-	    }
-	}
-
-	return errors;
+    private UserDTO getUser() {
+	return (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
     }
-
-    /**
-     * Upload the image to the open www/images/wookie folder
-     * 
-     * @param request
-     * @param imageForm
-     * @throws ImageGalleryException
-     */
-    private void uploadFormImage(AuthoringForm imageForm, Wookie wookie) throws Exception {
-
-	String filename = WookieConstants.DEFAULT_IMAGE_FILE_NAME;
-
-	// set up wookieService
-	if (wookieService == null) {
-	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
-	}
-
-	if (imageForm.getFile() != null) {
-
-	    // check the directory exists, then create it if it doesnt
-	    File wookieDir = new File(WookieConstants.LAMS_PIXLR_BASE_DIR);
-	    if (!wookieDir.exists()) {
-		wookieDir.mkdirs();
-	    }
-
-	    FormFile formFile = imageForm.getFile();
-
-	    filename = FileUtil.generateUniqueContentFolderID()
-		    + wookieService.getFileExtension(formFile.getFileName());
-	    String fileWriteName = WookieConstants.LAMS_PIXLR_BASE_DIR + File.separator + filename;
-	    File uploadFile = new File(fileWriteName);
-	    FileOutputStream out = new FileOutputStream(uploadFile);
-
-	    out.write(formFile.getFileData());
-
-	    // Now save the image size
-	    BufferedImage imageFile = ImageIO.read(uploadFile);
-	    int width = imageFile.getWidth();
-	    int height = imageFile.getHeight();
-
-	    wookie.setImageFileName(filename);
-	    wookie.setImageHeight(new Long(height));
-	    wookie.setImageWidth(new Long(width));
-	}
-
-    }
-
-    public ActionForward deleteImage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-	;
-
-	// set up wookieService
-	if (wookieService == null) {
-	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
-	}
-
-	// retrieving Wookie with given toolContentID
-	Wookie wookie = wookieService.getWookieByContentId(toolContentID);
-	if (wookie != null && !wookie.getImageFileName().equals(WookieConstants.DEFAULT_IMAGE_FILE_NAME)) {
-	    String realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator
-		    + FileUtil.LAMS_WWW_DIR + File.separator + "images" + File.separator + "wookie";
-	    String fileName = WebUtil.readStrParam(request, "existingImageFileName");
-
-	    String imageFileName = realBaseDir + File.separator + fileName;
-
-	    File imageFile = new File(imageFileName);
-
-	    if (imageFile.exists()) {
-		imageFile.delete();
-	    }
-
-	    wookie.setImageFileName(WookieConstants.DEFAULT_IMAGE_FILE_NAME);
-	    wookieService.saveOrUpdateWookie(wookie);
-	}
-
-	return unspecified(mapping, form, request, response);
-    }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	28 Jul 2009 05:30:23 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -24,9 +24,6 @@
 
 package org.lamsfoundation.lams.tool.wookie.web.actions;
 
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -35,11 +32,8 @@
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.Map.Entry;
 
-import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -56,7 +50,6 @@
 import org.lamsfoundation.lams.tool.wookie.dto.WookieDTO;
 import org.lamsfoundation.lams.tool.wookie.dto.WookieUserDTO;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
-import org.lamsfoundation.lams.tool.wookie.model.WookieConfigItem;
 import org.lamsfoundation.lams.tool.wookie.model.WookieSession;
 import org.lamsfoundation.lams.tool.wookie.model.WookieUser;
 import org.lamsfoundation.lams.tool.wookie.service.IWookieService;
@@ -67,7 +60,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -158,11 +150,6 @@
 	    wookieUser = getCurrentUser(toolSessionID);
 	}
 
-	// return to the viewAll images page if the user has already clicked it
-	if (wookieUser.isFinishedActivity() && wookie.isAllowViewOthersImages() && !isRedo) {
-	    return viewAllImages(mapping, learningForm, request, response);
-	}
-
 	// set up the user dto
 	WookieUserDTO wookieUserDTO = new WookieUserDTO(wookieUser);
 	if (wookieUser.isFinishedActivity()) {
@@ -183,19 +170,7 @@
 	String url = PIXLR_UTL + "?";
 	url += "&title=" + URLEncoder.encode(wookie.getTitle(), "UTF8");
 	url += "&referrer=LAMS";
-	url += "&loc=" + getWookieLocale();
 
-	String currentImageURL;
-
-	if (wookieUser.getImageFileName() != null && !wookieUser.getImageFileName().equals("")) {
-	    currentImageURL = WookieConstants.LAMS_WWW_PIXLR_FOLDER_URL + wookieUser.getImageFileName();
-	    returnURL += "&existingImage=" + URLEncoder.encode(wookieUser.getImageFileName(), "UTF8");
-	} else {
-	    returnURL += "&existingImage=";
-	    currentImageURL = WookieConstants.LAMS_WWW_PIXLR_FOLDER_URL + wookie.getImageFileName();
-	}
-
-	request.setAttribute("currentImageURL", currentImageURL);
 	request.setAttribute("wookieURL", url);
 	request.setAttribute("returnURL", returnURL);
 
@@ -209,63 +184,8 @@
 	return mapping.findForward("wookie");
     }
 
-    public ActionForward updateWookieImage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	Boolean success;
+    
 
-	log.debug("Saving image from wookie");
-
-	// set up wookieService
-	if (wookieService == null) {
-	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
-	}
-
-	String imageURL = WebUtil.readStrParam(request, "image");
-	Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
-
-	WookieUser wookieUser = getCurrentUser(toolSessionID);
-
-	String imageName = WebUtil.readStrParam(request, "existingImage", true);
-
-	if (imageName == null || imageName.equals("")) {
-	    imageName = FileUtil.generateUniqueContentFolderID() + ".jpg";
-	}
-
-	try {
-	    InputStream is = getResponseInputStreamFromExternalServer(imageURL, new HashMap<String, String>());
-
-	    String realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator
-		    + FileUtil.LAMS_WWW_DIR + File.separator + "images" + File.separator + "wookie";
-
-	    File imageFile = new File(realBaseDir + File.separator + imageName);
-
-	    FileOutputStream out = new FileOutputStream(imageFile);
-
-	    byte[] buf = new byte[1024];
-	    int len;
-	    while ((len = is.read(buf)) > 0) {
-		out.write(buf, 0, len);
-	    }
-	    
-	    wookieUser.setImageFileName(imageName);
-
-	    // Now save the image size
-	    BufferedImage imageBufferedFile = ImageIO.read(imageFile);
-	    int width = imageBufferedFile.getWidth();
-	    int height = imageBufferedFile.getHeight();
-	    wookieUser.setImageHeight(new Long(height));
-	    wookieUser.setImageWidth(new Long(width));
-	    wookieService.saveOrUpdateWookieUser(wookieUser);
-	    success = true;
-	} catch (Exception e) {
-	    log.error("Failed to copy wookie image from wookie server with URL: " + imageURL, e);
-	    success = false;
-	}
-
-	request.setAttribute("success", success);
-	return mapping.findForward("success");
-    }
-
     private WookieUser getCurrentUser(Long toolSessionId) {
 	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
@@ -397,87 +317,4 @@
 
 	return finishActivity(mapping, form, request, response);
     }
-
-    public ActionForward viewAllImages(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-
-	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, MODE_OPTIONAL);
-
-	// set up wookieService
-	if (wookieService == null) {
-	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
-	}
-
-	// Retrieve the session and content.
-	WookieSession wookieSession = wookieService.getSessionBySessionId(toolSessionID);
-	if (wookieSession == null) {
-	    throw new WookieException("Cannot retreive session with toolSessionID" + toolSessionID);
-	}
-
-	Wookie wookie = wookieSession.getWookie();
-
-	// get the user
-	WookieUser wookieUser;
-	if (mode.equals(ToolAccessMode.TEACHER)) {
-	    Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
-	    wookieUser = wookieService.getUserByUserIdAndSessionId(userID, toolSessionID);
-	} else {
-	    wookieUser = getCurrentUser(toolSessionID);
-	}
-
-	// set completed 
-	wookieUser.setFinishedActivity(true);
-	wookieService.saveOrUpdateWookieUser(wookieUser);
-
-	// set up the of images learner set
-	Set<WookieUserDTO> learnerSet = new HashSet<WookieUserDTO>();
-	for (WookieUser learner : wookieSession.getWookieUsers()) {
-	    if (learner.getImageFileName() != null && !learner.getImageFileName().equals("")
-		    && !learner.getImageFileName().equals(wookie.getImageFileName())) {
-
-		WookieUserDTO userDTO = new WookieUserDTO(learner);
-		if (userDTO.getImageFileName() == null || userDTO.getImageFileName().equals("")) {
-		    userDTO.setImageFileName(wookie.getImageFileName());
-		    userDTO.setImageHeight(wookie.getImageHeight());
-		    userDTO.setImageWidth(wookie.getImageWidth());
-		}
-		learnerSet.add(userDTO);
-	    }
-	}
-	request.setAttribute("learnerDTOs", learnerSet);
-	request.setAttribute("wookieDTO", new WookieDTO(wookie));
-	request.setAttribute("mode", mode);
-	request.setAttribute("wookieImageFolderURL", WookieConstants.LAMS_WWW_PIXLR_FOLDER_URL);
-	return mapping.findForward("viewAll");
-    }
-
-    /**
-     * Work out if this user's language is supported by wookie
-     * 
-     * @return
-     */
-    private String getWookieLocale() {
-	String locale = "en";
-
-	String languagesCSV = wookieService.getConfigItem(WookieConfigItem.KEY_LANGUAGE_CSV) != null ? wookieService
-		.getConfigItem(WookieConfigItem.KEY_LANGUAGE_CSV).getConfigValue() : null;
-
-	if (languagesCSV != null && !languagesCSV.equals("")) {
-	    UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-
-	    String[] languages = languagesCSV.split(",");
-
-	    for (int i = 0; i < languages.length; i++) {
-		if (languages[i].equals(user.getFckLanguageMapping())) {
-		    locale = languages[i];
-		    break;
-		}
-	    }
-
-	}
-
-	return locale;
-    }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/MonitoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/MonitoringAction.java	28 Jul 2009 05:30:23 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/MonitoringAction.java	31 Jul 2009 02:05:28 -0000	1.2
@@ -156,32 +156,4 @@
 
 	return mapping.findForward("notebook");
     }
-    
-    /**
-     * Opens a user's reflection
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    public ActionForward toggleHideImage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-
-	setupService();
-	MonitoringForm monitorForm = (MonitoringForm) form;
-	WookieUser wookieUser = wookieService.getUserByUID(monitorForm.getHideUserImageUid());
-	
-	if (wookieUser.isImageHidden())
-	{
-	    wookieUser.setImageHidden(false);
-	}
-	else
-	{
-	    wookieUser.setImageHidden(true);
-	}
-	wookieService.saveOrUpdateWookieUser(wookieUser);
-	return unspecified(mapping, monitorForm, request, response);
-    }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AdminForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AdminForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AdminForm.java	28 Jul 2009 05:30:24 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AdminForm.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -32,13 +32,15 @@
 import org.apache.struts.action.ActionMessages;
 
 /**
- * @struts.form name="lawookie10AdminForm"
+ * @struts.form name="wookieadminform"
  */
 public class AdminForm extends ActionForm {
 
-    private static final long serialVersionUID = 378528935723874238L;
+    private static final long serialVersionUID = 37832445233874238L;
 
-    String languagesCSV;
+    String apiKey;
+    String wookieServerUrl;
+    
 
     public AdminForm() {
     }
@@ -50,12 +52,19 @@
 	return ac;
     }
 
-    public String getLanguagesCSV() {
-	return languagesCSV;
+    public String getApiKey() {
+        return apiKey;
     }
 
-    public void setLanguagesCSV(String languagesCSV) {
-	this.languagesCSV = languagesCSV;
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
     }
 
+    public String getWookieServerUrl() {
+        return wookieServerUrl;
+    }
+
+    public void setWookieServerUrl(String wookieServerUrl) {
+        this.wookieServerUrl = wookieServerUrl;
+    }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java	28 Jul 2009 05:30:25 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/forms/AuthoringForm.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -79,8 +79,6 @@
     
     Long toolContentID;
     
-    String existingImageFileName;
-    
     String mode;
     
     // flag of this item has attachment or not
@@ -90,6 +88,13 @@
     private String fileName;
     private FormFile file;
     
+    // Wookie widget paramerters
+    String widgetAuthorUrl;
+    Integer widgetHeight;
+    Integer widgetWidth;
+    Boolean widgetMaximise;
+    String widgetIdentifier;
+    
 
     @Override
     public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
@@ -267,14 +272,6 @@
         this.mode = mode;
     }
 
-    public String getExistingImageFileName() {
-        return existingImageFileName;
-    }
-
-    public void setExistingImageFileName(String existingImageFileName) {
-        this.existingImageFileName = existingImageFileName;
-    }
-
     public String getReflectInstructions() {
         return reflectInstructions;
     }
@@ -290,5 +287,46 @@
     public void setAllowViewOthersImages(boolean allowViewOthersImages) {
         this.allowViewOthersImages = allowViewOthersImages;
     }
+
+    public String getWidgetAuthorUrl() {
+        return widgetAuthorUrl;
+    }
+
+    public void setWidgetAuthorUrl(String widgetAuthorUrl) {
+        this.widgetAuthorUrl = widgetAuthorUrl;
+    }
+
+    public Integer getWidgetHeight() {
+        return widgetHeight;
+    }
+
+    public void setWidgetHeight(Integer widgetHeight) {
+        this.widgetHeight = widgetHeight;
+    }
+
+    public Integer getWidgetWidth() {
+        return widgetWidth;
+    }
+
+    public void setWidgetWidth(Integer widgetWidth) {
+        this.widgetWidth = widgetWidth;
+    }
+
+    public Boolean getWidgetMaximise() {
+        return widgetMaximise;
+    }
+
+    public void setWidgetMaximise(Boolean widgetMaximise) {
+        this.widgetMaximise = widgetMaximise;
+    }
+
+    public String getWidgetIdentifier() {
+        return widgetIdentifier;
+    }
+
+    public void setWidgetIdentifier(String widgetIdentifier) {
+        this.widgetIdentifier = widgetIdentifier;
+    }
+
     
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java	28 Jul 2009 05:30:21 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/servlets/ExportServlet.java	31 Jul 2009 02:05:29 -0000	1.2
@@ -193,9 +193,7 @@
 
 	WookieDTO wookieDTO = new WookieDTO(wookie);
 	
-	// Creating a list of image files to copy for export
-	ArrayList<String> imageFiles = new ArrayList<String>();
-	imageFiles.add(wookie.getImageFileName());
+
 	
 	for (WookieSessionDTO sessionDTO : wookieDTO.getSessionDTOs()) {
 	    Long toolSessionID = sessionDTO.getSessionID();
@@ -207,31 +205,10 @@
 		if (notebookEntry != null) {
 		    userDTO.notebookEntry = notebookEntry.getEntry();
 		    userDTO.setFinishedReflection(true);
-		    if (userDTO.getImageFileName() != null && !userDTO.getImageFileName().equals(wookieDTO.getImageFileName()))
-		    {
-			imageFiles.add(userDTO.getImageFileName());
-		    }
 		}
 		
 	    }
 	}
-	
-	String[] imageFileArray = new String[imageFiles.size()];
-	int i=0;
-	for (String image : imageFiles)
-	{
-	    imageFileArray[i] = image;
-	    i++;
-	}
-	
-	// bundling the images in export
-	try {
-	    CustomToolImageBundler imageBundler = new CustomToolImageBundler();
-	    imageBundler.bundle(request, cookies, directoryName, WookieConstants.LAMS_WWW_PIXLR_FOLDER_URL, imageFileArray);
-	} catch (Exception e) {
-	    logger.error("Could not export gmap images, some images may be missing in export portfolio", e);
-	}
-	
 	request.getSession().setAttribute("wookieDTO", wookieDTO);
     }
 
Index: lams_tool_wookie/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/WEB-INF/struts/struts-config.xml	28 Jul 2009 05:30:15 -0000	1.1
+++ lams_tool_wookie/web/WEB-INF/struts/struts-config.xml	31 Jul 2009 02:05:28 -0000	1.2
@@ -22,7 +22,7 @@
       type="org.lamsfoundation.lams.tool.wookie.web.forms.LearningForm"
     />
     <form-bean
-      name="lawookie10AdminForm"
+      name="wookieadminform"
       type="org.lamsfoundation.lams.tool.wookie.web.forms.AdminForm"
     />
     <form-bean
@@ -46,9 +46,9 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/lawook10admin"
+      path="/admin"
       type="org.lamsfoundation.lams.tool.wookie.web.actions.AdminAction"
-      name="lawook10AdminForm"
+      name="wookieadminform"
       scope="request"
       parameter="dispatch"
       unknown="false"
Index: lams_tool_wookie/web/css/wookie.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/css/wookie.css,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/css/wookie.css	28 Jul 2009 05:30:20 -0000	1.1
+++ lams_tool_wookie/web/css/wookie.css	31 Jul 2009 02:05:29 -0000	1.2
@@ -41,20 +41,26 @@
 
 .wookie-title{
 	font-family: Verdana,Arial,sans-serif;
-    margin-top: 20px;
+    margin-top: 0px;
     font-weight: bold;
     font-size: 12px;
-    padding-left: 20px;
-    padding-right: 20px;
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 0px;
+    padding-bottom: 0px;
     height: 25px;
     text-align:center;
     vertical-align: top;        
 }
 
 .wookie-description{
-	margin-top: 20px;
+	margin-top: 0px;
+	margin-bottom: 10px;
     font-size: 10px;
-    padding: 20px;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 0px;
+    padding-bottom: 0px;
     height: 90px;    
     vertical-align: top;
     font-family: Verdana,Arial,sans-serif;
Index: lams_tool_wookie/web/pages/admin/config.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/pages/admin/config.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/pages/admin/config.jsp	28 Jul 2009 05:30:15 -0000	1.1
+++ lams_tool_wookie/web/pages/admin/config.jsp	31 Jul 2009 02:05:28 -0000	1.2
@@ -3,9 +3,9 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html>
+<lams:html>
 	<lams:head>
-		<title><fmt:message key="pageTitle.admin" /></title>
+		<title><fmt:message key="admin.page.title" /></title>
 		<lams:css/>
 	</lams:head>
 	
@@ -14,7 +14,7 @@
 			<div id="content">
 
 			<h1>
-				<fmt:message key="pageTitle.admin" />
+				<fmt:message key="admin.page.title" />
 			</h1>
 			
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do"><fmt:message key="admin.return" /></a>
@@ -30,25 +30,28 @@
 			<c:if test="${savedSuccess}">
 				<p class="info">
 					<fmt:message key="admin.success" />
-				<p>
+				</p>
 			</c:if>
+			</p>
 			
-			<html:form action="/lawookie10admin" styleId="lawookie10AdminForm" method="post" enctype="multipart/form-data">
+			<html:form action="/admin" styleId="wookieadminform" method="post" enctype="multipart/form-data">
 				
 				<html:hidden property="dispatch" value="saveContent" />
 				<table class="alternative-color">
 					<tr>
-						<td width="30%"><fmt:message key="admin.wookieLanguageCSV" /></td>
-						<td width="70%"><html:text property="languagesCSV" size="50" maxlength="511"></html:text></td>
+						<td width="30%"><fmt:message key="admin.wookie.apikey" /></td>
+						<td width="70%"><html:text property="apiKey" size="50" maxlength="511"></html:text></td>
 					</tr>
+					<tr>
+						<td width="30%"><fmt:message key="admin.wookie.url" /></td>
+						<td width="70%"><html:text property="wookieServerUrl" size="50" maxlength="511"></html:text></td>
+					</tr>
 				</table>
 				
 				<html:submit><fmt:message key="button.save" /></html:submit>
 			
 			</html:form>
 			
-			
-				
 			</div>
 			<!--closes content-->
 
@@ -58,4 +61,4 @@
 
 	</body>
 
-</head>
+</lams:html>
Index: lams_tool_wookie/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/pages/authoring/authoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/pages/authoring/authoring.jsp	28 Jul 2009 05:30:19 -0000	1.1
+++ lams_tool_wookie/web/pages/authoring/authoring.jsp	31 Jul 2009 02:05:28 -0000	1.2
@@ -37,8 +37,7 @@
 		<html:hidden property="toolContentID" />
 		<html:hidden property="mode" value=""/>
 		<html:hidden property="contentFolderID" />
-		<html:hidden property="existingImageFileName" />
-
+		
 		<div id="message" style="text-align: center;">
 			<c:if test="${unsavedChanges}">
 				<fmt:message key="message.unsavedChanges" />
Index: lams_tool_wookie/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/pages/authoring/basic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/pages/authoring/basic.jsp	28 Jul 2009 05:30:19 -0000	1.1
+++ lams_tool_wookie/web/pages/authoring/basic.jsp	31 Jul 2009 02:05:28 -0000	1.2
@@ -10,51 +10,58 @@
 	var origImageHeight;
 	var origImageWidth;
 	var pageCount = ${widgetPages};
+	var browseAreaLoaded = false;
 	
 	function submitForm(dispatch)
 	{
 		document.getElementById("dispatch").value = dispatch;
 		document.getElementById("authoringForm").submit();
 	}
-	
-	function openImage(url)
-	{
-		openPopup(url, origImageHeight, origImageWidth);
-	}
 
 	jQuery(document).ready(function() {
 
 		// Set the initial width of the pager div
 		var width = getAppropriateWidth(pageCount) + "px";
 		document.getElementById("container").style.width = width;
 
-		jQuery("#pager").pager({ pagenumber: 1, pagecount: pageCount, buttonClickCallback: PageClick });
-        jQuery.ajax({		
-			type: "GET",
-			url: "<lams:WebAppURL/>/authoring.do",
-			data: {dispatch : "getWidgets", pageNumber : 1},
-			cache: false,
-			success: function (html) {
-				jQuery("#result").html(html);
-			}
-							
-		});
+		<c:choose>
+			<c:when test="${empty formBean.widgetAuthorUrl}">
+				// No saved widget so load the view
+				loadBrowseArea(1);
+		        document.getElementById("widgetViewArea").style.display="none";
+		        document.getElementById("widgetBrowseArea").style.display="block";
+			</c:when>
+			<c:otherwise>
+				// Load the widget if it has previously been saved
+				document.getElementById("widgetBrowseArea").style.display="none";
+				document.getElementById("widgetViewArea").style.display="block";
+				enableWidgetIframe("${formBean.widgetAuthorUrl}", "${formBean.widgetHeight}", "${formBean.widgetWidth}");
+			</c:otherwise>
+		</c:choose>
     });
 
     PageClick = function(pageclickednumber) {
-    	jQuery("#pager").pager({ pagenumber: pageclickednumber, pagecount: pageCount, buttonClickCallback: PageClick });
+    	loadBrowseArea(pageclickednumber);
+    }
+
+    // Loads the brows area to the specified page number
+    function loadBrowseArea(pageNumber) {
+
+		alert("Loading browse area");
+    	jQuery("#pager").pager({ pagenumber: pageNumber, pagecount: pageCount, buttonClickCallback: PageClick });
         jQuery.ajax({		
 			type: "GET",
 			url: "<lams:WebAppURL/>/authoring.do",
-			data: {dispatch : "getWidgets", pageNumber : pageclickednumber},
+			data: {dispatch : "getWidgets", pageNumber : 1},
 			cache: false,
 			success: function (html) {
 				jQuery("#result").html(html);
 			}
-							
 		});
+        browseAreaLoaded = true;
     }
 
+	// Get the appropriate width for the pager div
     function getAppropriateWidth(pages) {
 		var maxPageButtons = 9;
 		var width = 170;
@@ -67,12 +74,77 @@
     	return width;
     }
 
+    // Callback to server when a widget is selected
+    function selectWookieWidget(widgetid) {
+    	document.getElementById("widgetIdentifier").value = widgetid;
+    	jQuery.ajax({		
+			type: "GET",
+			url: "<lams:WebAppURL/>/authoring.do",
+			data: {dispatch :"initiateWidget", widgetid:widgetid, toolContentID:"${sessionMap.toolContentID}" },
+			cache: false,
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+					
+				// TODO: Good error message
+				alert(errorThrown);
+			},				
+			success: function (xml) {
+
+				// Set the parameters from the returned xml
+				var widgetUrl = jQuery(xml).find("url").text();
+				document.getElementById("widgetAuthorUrl").value = widgetUrl;
+				
+				var widgetHeight = jQuery(xml).find("height").text();
+				document.getElementById("widgetHeight").value = widgetHeight;
+				
+				var widgetWidth = jQuery(xml).find("width").text();
+				document.getElementById("widgetWidth").value = widgetWidth;
+				
+				var widgetMaximize = jQuery(xml).find("widgetMaximize").text();
+				document.getElementById("widgetMaximise").value = widgetMaximize;
+
+				enableWidgetIframe(widgetUrl, widgetHeight, widgetWidth);
+			}
+							
+		});
+    }
+
+ 	// Loads the widget in an iframe
+    function enableWidgetIframe(url, height, width) {
+    	var iframe = document.getElementById("widgetIframe");
+		iframe.style.height = height + "px";
+		iframe.style.width = width + "px";
+		iframe.src=url;
+		iframe.style.display="block";
+		jQuery("#widgetBrowseArea").toggle("slow");
+		setTimeout('jQuery("#widgetViewArea").toggle("slow");',1000);
+    }
+
+	// Cancel a widget and return to browse mode
+    function cancelWidget(){
+    	document.getElementById("widgetAuthorUrl").value = "";
+    	document.getElementById("widgetHeight").value = "";
+    	document.getElementById("widgetWidth").value = "";
+    	document.getElementById("widgetMaximise").value = "";
+    	document.getElementById("widgetIdentifier").value = "";
+    	jQuery("#widgetViewArea").toggle("fast");
+		if (browseAreaLoaded == false) {
+			loadBrowseArea(1);
+			document.getElementById("widgetBrowseArea").style.display="block";
+		} else {
+			jQuery("#widgetBrowseArea").toggle("fast");
+		}
+		
+    }
 	
 //-->
 </script>
 
+<html:hidden property="widgetAuthorUrl" styleId="widgetAuthorUrl"/>
+<html:hidden property="widgetHeight" styleId="widgetHeight"/>
+<html:hidden property="widgetWidth" styleId="widgetWidth"/>
+<html:hidden property="widgetMaximise" styleId="widgetMaximise"/>
+<html:hidden property="widgetIdentifier" styleId="widgetIdentifier"/>
 
-
 <!-- ========== Basic Tab ========== -->
 <table cellpadding="0">
 	<tr>
@@ -95,10 +167,25 @@
 	</tr>
 	<tr align="center">
 		<td>
-			<div id="result" ></div>
-			<div id="container" class="wookie-list" >
-				<div id="pager" ></div>
+			<div id="widgetBrowseArea">
+				<div id="result" ></div>
+				<div id="container" class="wookie-list" >
+					<div id="pager" ></div>
+				</div>
 			</div>
+			
+			<div id="widgetViewArea" >
+				<iframe
+					id="widgetIframe" 
+					name="widgetIframe"
+					style="width:0px;height:0px;border:0px;" 
+					frameborder="no"
+					scrolling="no">
+				</iframe>
+				
+				<a href="javascript:cancelWidget()" class="button"><fmt:message key="button.cancel" /></a>
+			</div>
+			
 		</td>
 	</tr>
 </table>
Index: lams_tool_wookie/web/pages/authoring/widgetList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/pages/authoring/widgetList.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wookie/web/pages/authoring/widgetList.jsp	28 Jul 2009 05:30:19 -0000	1.1
+++ lams_tool_wookie/web/pages/authoring/widgetList.jsp	31 Jul 2009 02:05:28 -0000	1.2
@@ -15,7 +15,7 @@
 					</tr>
 					<tr align="center">
 						<td class="wookie-title" align="center" valign="top">
-							${widget.title}
+							<a href="javascript:selectWookieWidget('${widget.identifier}')">${widget.title}</a>
 						</td>
 					</tr>
 					<tr align="center">
@@ -44,9 +44,10 @@
 					</tr>
 					<tr align="center">
 						<td class="wookie-title" align="center" valign="top">
-							${widget.title}
+							<a href="javascript:selectWookieWidget('${widget.identifier}')">${widget.title}</a>
 						</td>
 					</tr>
+					
 					<tr align="center">
 						<td class="wookie-description" align="center" valign="top">
 							${widget.description}