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.8 --- 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 05:56:01 -0000 1.8 @@ -19,6 +19,7 @@ + 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.50 -r1.51 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 3 Feb 2009 05:47:41 -0000 1.50 +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 16 Mar 2009 05:56:01 -0000 1.51 @@ -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_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.10 --- 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 05:55:59 -0000 1.10 @@ -55,6 +55,7 @@ + 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.50 -r1.51 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 6 Jan 2009 03:43:59 -0000 1.50 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 16 Mar 2009 05:55:59 -0000 1.51 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dimdimApplicationContext.xml,v diff -u -r1.2 -r1.3 --- 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 05:56:02 -0000 1.3 @@ -41,6 +41,7 @@ + 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.15 --- 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 05:56:02 -0000 1.15 @@ -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.4 --- 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 05:56:05 -0000 1.4 @@ -43,6 +43,7 @@ + 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.14 --- 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 05:56:06 -0000 1.14 @@ -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.103 --- 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 05:56:05 -0000 1.103 @@ -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.87 -r1.88 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 19 Feb 2009 23:59:14 -0000 1.87 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 16 Mar 2009 05:56:00 -0000 1.88 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v diff -u -r1.5 -r1.6 --- 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 05:55:59 -0000 1.6 @@ -52,6 +52,7 @@ + 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.20 -r1.21 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 6 Jan 2009 03:13:23 -0000 1.20 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 16 Mar 2009 05:56:00 -0000 1.21 @@ -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/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.22 --- 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 05:56:03 -0000 1.22 @@ -71,6 +71,7 @@ + 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.78 --- 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 05:56:03 -0000 1.78 @@ -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_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.5 --- 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 05:56:03 -0000 1.5 @@ -42,6 +42,7 @@ + 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.21 -r1.22 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 26 Feb 2009 19:19:21 -0000 1.21 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 16 Mar 2009 05:56:04 -0000 1.22 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.64 -r1.65 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 18 Feb 2009 23:06:58 -0000 1.64 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 16 Mar 2009 05:56:04 -0000 1.65 @@ -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/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.3 --- 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 05:56:06 -0000 1.3 @@ -46,6 +46,7 @@ + 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.10 --- 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 05:56:06 -0000 1.10 @@ -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; + } + }