Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml,v
diff -u -r1.7 -r1.7.10.1
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	26 Jun 2006 06:46:16 -0000	1.7
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	16 Mar 2009 07:16:41 -0000	1.7.10.1
@@ -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_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v
diff -u -r1.49 -r1.49.2.1
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	15 Aug 2008 04:37:41 -0000	1.49
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	16 Mar 2009 07:16:41 -0000	1.49.2.1
@@ -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) {
@@ -811,7 +816,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_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	27 Oct 2008 03:31:23 -0000	1.9
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	16 Mar 2009 07:16:40 -0000	1.9.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v
diff -u -r1.49 -r1.49.2.1
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	12 Nov 2008 00:26:06 -0000	1.49
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	16 Mar 2009 07:16:40 -0000	1.49.2.1
@@ -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;
     }
@@ -897,7 +904,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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml	15 Sep 2008 11:06:40 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml	16 Mar 2009 07:16:41 -0000	1.2.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java,v
diff -u -r1.14 -r1.14.2.1
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	28 Nov 2008 04:45:14 -0000	1.14
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	16 Mar 2009 07:16:42 -0000	1.14.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	18 Sep 2008 01:41:10 -0000	1.3
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	16 Mar 2009 07:16:44 -0000	1.3.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	18 Sep 2008 01:41:10 -0000	1.13
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	16 Mar 2009 07:16:44 -0000	1.13.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.102 -r1.102.2.1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	15 May 2008 05:40:13 -0000	1.102
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	16 Mar 2009 07:16:44 -0000	1.102.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.83.2.1 -r1.83.2.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	19 Feb 2009 03:07:16 -0000	1.83.2.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	16 Mar 2009 07:16:41 -0000	1.83.2.2
@@ -1405,7 +1405,6 @@
      * @throws SubmitFilesException
      */
     public ITicket getRepositoryLoginTicket() throws QaApplicationException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	QaServicePOJO.logger.debug("retrieved repositoryService : " + repositoryService);
 
 	ICredentials credentials = new SimpleCredentials(repositoryUser, repositoryId);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	4 Oct 2008 02:47:52 -0000	1.5
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	16 Mar 2009 07:16:41 -0000	1.5.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v
diff -u -r1.18 -r1.18.2.1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	31 Oct 2008 05:57:26 -0000	1.18
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	16 Mar 2009 07:16:41 -0000	1.18.2.1
@@ -47,7 +47,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;
@@ -482,7 +481,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws NotebookException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(NotebookToolContentHandler.repositoryUser,
 		NotebookToolContentHandler.repositoryId);
 	try {
@@ -614,7 +612,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/submitFilesApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v
diff -u -r1.21 -r1.21.2.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	10 Oct 2008 00:37:16 -0000	1.21
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	16 Mar 2009 07:16:42 -0000	1.21.2.1
@@ -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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.77 -r1.77.2.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	10 Oct 2008 00:37:16 -0000	1.77
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	16 Mar 2009 07:16:42 -0000	1.77.2.1
@@ -58,7 +58,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.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -414,7 +413,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws SubmitFilesException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(SbmtToolContentHandler.repositoryUser,
 		SbmtToolContentHandler.repositoryId);
 	try {
@@ -1067,7 +1065,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_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml,v
diff -u -r1.4 -r1.4.4.1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	31 Oct 2006 23:17:29 -0000	1.4
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	16 Mar 2009 07:16:43 -0000	1.4.4.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v
diff -u -r1.19 -r1.19.2.1
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	5 May 2008 10:12:22 -0000	1.19
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	16 Mar 2009 07:16:43 -0000	1.19.2.1
@@ -537,7 +537,6 @@
 	 * @throws SubmitFilesException
 	 */
 	private ITicket getRepositoryLoginTicket() throws ScribeException {
-		repositoryService = RepositoryProxy.getRepositoryService();
 		ICredentials credentials = new SimpleCredentials(
 				ScribeToolContentHandler.repositoryUser,
 				ScribeToolContentHandler.repositoryId);
@@ -631,6 +630,14 @@
 		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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.62.2.1 -r1.62.2.2
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	18 Feb 2009 05:26:45 -0000	1.62.2.1
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	16 Mar 2009 07:16:43 -0000	1.62.2.2
@@ -1554,9 +1554,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, repositoryWorkspaceName);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	21 Oct 2008 03:20:19 -0000	1.2
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	16 Mar 2009 07:16:42 -0000	1.2.2.1
@@ -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">
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	21 Oct 2008 03:20:19 -0000	1.9
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	16 Mar 2009 07:16:42 -0000	1.9.2.1
@@ -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.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -834,7 +833,6 @@
      * @throws SubmitFilesException
      */
     private ITicket getRepositoryLoginTicket() throws WikiException {
-	repositoryService = RepositoryProxy.getRepositoryService();
 	ICredentials credentials = new SimpleCredentials(WikiToolContentHandler.repositoryUser,
 		WikiToolContentHandler.repositoryId);
 	try {
@@ -1084,4 +1082,12 @@
 	this.lessonService = lessonService;
     }
     
+    public IRepositoryService getRepositoryService() {
+        return repositoryService;
+    }
+
+    public void setRepositoryService(IRepositoryService repositoryService) {
+        this.repositoryService = repositoryService;
+    }
+    
 }