Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
diff -u -rb9c68da61a40efc2425fb80c0c1e7b06f8fcfe78 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision b9c68da61a40efc2425fb80c0c1e7b06f8fcfe78)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -48,7 +48,6 @@
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
 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.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
@@ -121,6 +120,12 @@
 		this.authoringService = authoringService;
 	}	
 	/**
+	 * @param repositoryService The repositoryService to set.  
+	 */
+	public void setRepositoryService(IRepositoryService repositoryService) {
+	    this.repositoryService = repositoryService;
+	}
+	/**
 	 * @param learningDesignDAO The learningDesignDAO to set.
 	 */
 	public void setLearningDesignDAO(ILearningDesignDAO learningDesignDAO) {
@@ -813,7 +818,6 @@
 	 * @return ITicket The ticket for repostory access
 	 */
 	private ITicket getRepositoryLoginTicket(){
-		repositoryService = RepositoryProxy.getLocalRepositoryService();
 		ICredentials credentials = new SimpleCredentials(IWorkspaceManagementService.REPOSITORY_USERNAME,
 				 										 IWorkspaceManagementService.REPOSITORY_PASSWORD.toCharArray());		
 		ITicket ticket = null;
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
===================================================================
diff -u -r2a13c8095cfed5f8897f1ef53aaa094942db4a96 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 2a13c8095cfed5f8897f1ef53aaa094942db4a96)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -19,6 +19,7 @@
 		<property name="authoringService"><ref bean="authoringService"/></property>
 		<property name="userMgmtService"><ref bean="userManagementService"/></property>
 		<property name="messageService"><ref bean="workspaceMessageService"/></property>
+		<property name="repositoryService"><ref bean="repositoryService" /></property>
 	</bean>
 	
 	<bean id="workspaceManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision cd0d0b28a7c27711a74ce2b41821f3ccf5c80df9)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -55,6 +55,7 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="chatOutputFactory"><ref bean="chatOutputFactory"/></property>
+				<property name="repositoryService"><ref bean="repositoryService" /></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r17be8146c14155314d21784f5a24b6e10ee4818a -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 17be8146c14155314d21784f5a24b6e10ee4818a)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -62,7 +62,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;
@@ -819,6 +818,14 @@
 	return chatMessageDAO.getLatest(chatSession, max);
     }
 
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+
     public IAuditService getAuditService() {
 	return auditService;
     }
@@ -901,7 +908,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws ChatException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(ChatToolContentHandler.repositoryUser,
 		ChatToolContentHandler.repositoryId);
 	try {
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml
===================================================================
diff -u -r2714c5d509bed30e460ccc453753e6504804d4a1 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml	(.../dimdimApplicationContext.xml)	(revision 2714c5d509bed30e460ccc453753e6504804d4a1)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml	(.../dimdimApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -41,6 +41,7 @@
  				<property name="dimdimToolContentHandler"><ref bean="dimdimToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
+   				<property name="repositoryService"><ref bean="repositoryService" /></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	(.../DimdimService.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	(.../DimdimService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -53,7 +53,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;
@@ -624,7 +623,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws DimdimException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(DimdimToolContentHandler.repositoryUser,
 		DimdimToolContentHandler.repositoryId);
 	try {
@@ -771,4 +769,12 @@
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
+    
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
diff -u -ra8324ce68a8de301097e84ef4919751ecd0b8fe8 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision a8324ce68a8de301097e84ef4919751ecd0b8fe8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -43,6 +43,7 @@
  				<property name="gmapToolContentHandler"><ref bean="gmapToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
+		   		<property name="repositoryService"><ref bean="repositoryService" /></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -ra8324ce68a8de301097e84ef4919751ecd0b8fe8 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision a8324ce68a8de301097e84ef4919751ecd0b8fe8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -52,7 +52,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;
@@ -647,7 +646,6 @@
 	 * @throws SubmitFilesException
 	 */
 	private ITicket getRepositoryLoginTicket() throws GmapException {
-		repositoryService = RepositoryProxy.getRepositoryService();
 		ICredentials credentials = new SimpleCredentials(
 				GmapToolContentHandler.repositoryUser,
 				GmapToolContentHandler.repositoryId);
@@ -782,7 +780,15 @@
 	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 		this.coreNotebookService = coreNotebookService;
 	}
+	
+	public IRepositoryService getRepositoryService() {
+	    return repositoryService;
+	}
 
+	public void setRepositoryService(IRepositoryService repositoryService) {
+	    this.repositoryService = repositoryService;
+	}
+
 	public IGmapMarkerDAO getGmapMarkerDAO() {
 		return gmapMarkerDAO;
 	}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r7936e8f7de045aea09aaa715f3027061f05a1c15 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 7936e8f7de045aea09aaa715f3027061f05a1c15)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -1903,9 +1903,6 @@
 	 * @throws SubmitFilesException
 	 */
 	public ITicket getRepositoryLoginTicket() throws McApplicationException {
-		repositoryService = RepositoryProxy.getRepositoryService();
-    	logger.debug("retrieved repositoryService : " + repositoryService);
-		
 		ICredentials credentials = new SimpleCredentials(
 				repositoryUser,
 				repositoryId);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r328cd4dbe60d9e5c588e13cc16b7e7414893b0af -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 328cd4dbe60d9e5c588e13cc16b7e7414893b0af)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -1372,8 +1372,6 @@
      * @throws SubmitFilesException
      */
     public ITicket getRepositoryLoginTicket() throws QaApplicationException {
-	repositoryService = RepositoryProxy.getRepositoryService();
-
 	ICredentials credentials = new SimpleCredentials(repositoryUser, repositoryId);
 	try {
 	    ITicket ticket = repositoryService.login(credentials, repositoryWorkspace);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
diff -u -re64f3e306f3139c78e8917240c33ea232e75e848 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision e64f3e306f3139c78e8917240c33ea232e75e848)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -52,6 +52,7 @@
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 		   		<property name="notebookOutputFactory"><ref bean="notebookOutputFactory"/></property>
+		   		<property name="repositoryService"><ref bean="repositoryService"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -re5af6afc99f1e731e4fe994dfc58fea86acd574c -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision e5af6afc99f1e731e4fe994dfc58fea86acd574c)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -482,7 +482,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws NotebookException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(NotebookToolContentHandler.repositoryUser,
 		NotebookToolContentHandler.repositoryId);
 	try {
@@ -614,7 +613,15 @@
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
+    
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
 
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+
     public NotebookOutputFactory getNotebookOutputFactory() {
 	return notebookOutputFactory;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision ef2417616a93e7d6f1eaee601fd78455a90564d6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -414,7 +414,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws SubmitFilesException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(SbmtToolContentHandler.repositoryUser,
 		SbmtToolContentHandler.repositoryId);
 	try {
@@ -1067,7 +1066,15 @@
     public void setLearnerService(ILearnerService learnerService) {
 	this.learnerService = learnerService;
     }
+    
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
 
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+
     public ILamsToolService getToolService() {
 	return toolService;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision ef2417616a93e7d6f1eaee601fd78455a90564d6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -71,6 +71,7 @@
 		<property name="messageService"><ref bean="sbmtMessageService"/></property>
 		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 		<property name="lessonService"><ref bean="lessonService"/></property> 
+		<property name="repositoryService"><ref bean="repositoryService" /></property>
 	</bean>
 	
 	<bean id="submitFilesService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
diff -u -r51cd744e821c2602f453bedcd22f89887f92d468 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 51cd744e821c2602f453bedcd22f89887f92d468)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -42,6 +42,7 @@
  				<property name="scribeToolContentHandler"><ref bean="lascrbScribeToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
+		   		<property name="repositoryService"><ref bean="repositoryService"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
diff -u -r8f7975d272f91acc26c785848d82d26d6b5dd357 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 8f7975d272f91acc26c785848d82d26d6b5dd357)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -515,7 +515,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws ScribeException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(ScribeToolContentHandler.repositoryUser,
 		ScribeToolContentHandler.repositoryId);
 	try {
@@ -603,7 +602,15 @@
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
+    
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
 
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+
     public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
 	return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r2ed86809be97c2553630665e20d6cc21b57c531c -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 2ed86809be97c2553630665e20d6cc21b57c531c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -1557,9 +1557,6 @@
      * @throws SubmitFilesException
      */
     public ITicket getRepositoryLoginTicket() throws VoteApplicationException {
-	repositoryService = RepositoryProxy.getRepositoryService();
-	logger.debug("retrieved repositoryService : " + repositoryService);
-
 	ICredentials credentials = new SimpleCredentials(repositoryUser, repositoryId);
 	try {
 	    ITicket ticket = repositoryService.login(credentials, VoteServicePOJO.repositoryWorkspaceName);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -834,7 +834,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws WikiException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(WikiToolContentHandler.repositoryUser,
 		WikiToolContentHandler.repositoryId);
 	try {
@@ -1084,4 +1083,12 @@
 	this.lessonService = lessonService;
     }
     
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+    
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r0f8935bc85059df40ad07b28c5b9b2ed844fc74d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 0f8935bc85059df40ad07b28c5b9b2ed844fc74d)
@@ -46,6 +46,7 @@
 		   		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 		   		<property name="messageService"><ref bean="wikiMessageService"/></property>
 		   		<property name="lessonService"><ref bean="lessonService"/></property> 
+		   		<property name="repositoryService"><ref bean="repositoryService"/></property> 
 			</bean>
 		</property>
 		<property name="transactionAttributes">