Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
diff -u -rf31b75c40cca57454726c6f43dfba57cc2dae37c -r647644862f7a21c589db91a4e21bba36970ce236
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision f31b75c40cca57454726c6f43dfba57cc2dae37c)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision 647644862f7a21c589db91a4e21bba36970ce236)
@@ -52,6 +52,7 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="pixlrOutputFactory"><ref bean="pixlrOutputFactory"/></property>
+		   		<property name="repositoryService"><ref bean="repositoryService" /></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
===================================================================
diff -u -rf31b75c40cca57454726c6f43dfba57cc2dae37c -r647644862f7a21c589db91a4e21bba36970ce236
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	(.../PixlrService.java)	(revision f31b75c40cca57454726c6f43dfba57cc2dae37c)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	(.../PixlrService.java)	(revision 647644862f7a21c589db91a4e21bba36970ce236)
@@ -48,7 +48,6 @@
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
@@ -603,7 +602,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws PixlrException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(PixlrToolContentHandler.repositoryUser,
 		PixlrToolContentHandler.repositoryId);
 	try {
@@ -763,4 +761,12 @@
     public void setPixlrConfigItemDAO(IPixlrConfigItemDAO pixlrConfigItemDAO) {
         this.pixlrConfigItemDAO = pixlrConfigItemDAO;
     }
+
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }    
 }
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
===================================================================
diff -u -r42aa5319fbd33938828764c43dd0ab1ca80e2416 -r647644862f7a21c589db91a4e21bba36970ce236
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 42aa5319fbd33938828764c43dd0ab1ca80e2416)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	(.../VideoRecorderService.java)	(revision 647644862f7a21c589db91a4e21bba36970ce236)
@@ -30,7 +30,6 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
@@ -55,8 +54,6 @@
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
-import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
-import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
@@ -68,16 +65,17 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderCommentDTO;
-import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRatingDTO;
-import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderAttachmentDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderCommentDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRatingDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRecordingDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderSessionDAO;
 import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderUserDAO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderCommentDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRatingDTO;
+import org.lamsfoundation.lams.tool.videoRecorder.dto.VideoRecorderRecordingDTO;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorder;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderAttachment;
 import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment;
@@ -89,7 +87,6 @@
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderConstants;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderException;
 import org.lamsfoundation.lams.tool.videoRecorder.util.VideoRecorderToolContentHandler;
-import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -592,7 +589,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws VideoRecorderException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(VideoRecorderToolContentHandler.repositoryUser,
 		VideoRecorderToolContentHandler.repositoryId);
 	try {
@@ -764,6 +760,14 @@
 	this.videoRecorderOutputFactory = videoRecorderOutputFactory;
     }
 
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+
     /**
      * {@inheritDoc}
      */
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml
===================================================================
diff -u -r049932651d9d1c08ed1681df0a044d7f519a4215 -r647644862f7a21c589db91a4e21bba36970ce236
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 049932651d9d1c08ed1681df0a044d7f519a4215)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision 647644862f7a21c589db91a4e21bba36970ce236)
@@ -59,6 +59,7 @@
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="videoRecorderOutputFactory"><ref bean="videoRecorderOutputFactory"/></property>
 		   		<property name="messageService"><ref bean="videoRecorderMessageService"/></property>  
+		   		<property name="respositoryService"><ref bean="repositoryService" /></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">