Fisheye: Tag 89c234fa5993540a1c125c31d3c57f00b7fb3efb refers to a dead (removed) revision in file `lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 89c234fa5993540a1c125c31d3c57f00b7fb3efb refers to a dead (removed) revision in file `lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 89c234fa5993540a1c125c31d3c57f00b7fb3efb refers to a dead (removed) revision in file `lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 89c234fa5993540a1c125c31d3c57f00b7fb3efb refers to a dead (removed) revision in file `lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 89c234fa5993540a1c125c31d3c57f00b7fb3efb refers to a dead (removed) revision in file `lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java (.../Wiki.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java (.../Wiki.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -21,95 +21,116 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.wiki.model; import java.util.Date; import java.util.HashSet; import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.log4j.Logger; -/** - * - */ - +@Entity +@Table(name = "tl_lawiki10_wiki") public class Wiki implements java.io.Serializable, Cloneable { - /** - * - */ private static final long serialVersionUID = 382787654329119829L; static Logger log = Logger.getLogger(Wiki.class.getName()); - // Fields - /** - * - */ + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "create_date") private Date createDate; + @Column(name = "update_date") private Date updateDate; + @Column(name = "create_by") private Long createBy; + @Column private String title; + @Column private String instructions; // BEGIN ADVANCED OPTIONS------------------ // Lock the wiki after learner is finished + @Column(name = "lock_on_finished") private boolean lockOnFinished; // Allow learners to create their own pages + @Column(name = "allow_learner_create_pages") private boolean allowLearnerCreatePages; // Allow learners to insert external links into wiki + @Column(name = "allow_learner_insert_links") private boolean allowLearnerInsertLinks; // Allow learners to attach images to the wiki page + @Column(name = "allow_learner_attach_images") private boolean allowLearnerAttachImages; // Add notification for wiki updates + @Column(name = "notify_updates") private boolean notifyUpdates; // Add notebook at the end of activity + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; // instructions for notebook + @Column(name = "reflect_instructions") private String reflectInstructions; // Minimum number of edits a learner must do before finishing activity + @Column(name = "minimum_edits") private Integer minimumEdits; // Maximum number of edits a learner can do for an activity + @Column(name = "maximum_edits") private Integer maximumEdits; // END ADVANCED OPTIONS------------------ + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "tool_content_id") private Long toolContentId; - - private Date submissionDeadline; + @Column(name = "submission_deadline") + private Date submissionDeadline; + + @OneToMany(mappedBy = "wiki") private Set wikiSessions; + @OneToMany(mappedBy = "parentWiki") + @OrderBy("uid ASC") private Set wikiPages; + @ManyToOne + @JoinColumn(name = "wiki_main_page_uid") private WikiPage mainPage; - // Property accessors - /** - * - * - */ - public Long getUid() { return this.uid; } @@ -118,11 +139,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getCreateDate() { return this.createDate; } @@ -131,11 +147,6 @@ this.createDate = createDate; } - /** - * - * - */ - public Date getUpdateDate() { return this.updateDate; } @@ -144,11 +155,6 @@ this.updateDate = updateDate; } - /** - * - * - */ - public Long getCreateBy() { return this.createBy; } @@ -157,11 +163,6 @@ this.createBy = createBy; } - /** - * - * - */ - public String getTitle() { return this.title; } @@ -170,11 +171,6 @@ this.title = title; } - /** - * - * - */ - public String getInstructions() { return this.instructions; } @@ -183,11 +179,6 @@ this.instructions = instructions; } - /** - * - * - */ - public boolean isLockOnFinished() { return this.lockOnFinished; } @@ -196,10 +187,6 @@ this.lockOnFinished = lockOnFinished; } - /** - * - * - */ public boolean isAllowLearnerCreatePages() { return allowLearnerCreatePages; } @@ -208,10 +195,6 @@ this.allowLearnerCreatePages = allowLearnerCreatePages; } - /** - * - * - */ public boolean isAllowLearnerInsertLinks() { return allowLearnerInsertLinks; } @@ -220,10 +203,6 @@ this.allowLearnerInsertLinks = allowLearnerInsertLinks; } - /** - * - * - */ public boolean isAllowLearnerAttachImages() { return allowLearnerAttachImages; } @@ -232,10 +211,6 @@ this.allowLearnerAttachImages = allowLearnerAttachImages; } - /** - * - * - */ public boolean isNotifyUpdates() { return notifyUpdates; } @@ -244,9 +219,6 @@ this.notifyUpdates = notifyUpdates; } - /** - * - */ public boolean isReflectOnActivity() { return reflectOnActivity; } @@ -255,9 +227,6 @@ this.reflectOnActivity = reflectOnActivity; } - /** - * - */ public String getReflectInstructions() { return reflectInstructions; } @@ -266,9 +235,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - */ public Integer getMinimumEdits() { return minimumEdits; } @@ -277,9 +243,6 @@ this.minimumEdits = minimumEdits; } - /** - * - */ public Integer getMaximumEdits() { return maximumEdits; } @@ -288,11 +251,6 @@ this.maximumEdits = maximumEdits; } - /** - * - * - */ - public boolean isContentInUse() { return this.contentInUse; } @@ -301,11 +259,6 @@ this.contentInUse = contentInUse; } - /** - * - * - */ - public boolean isDefineLater() { return this.defineLater; } @@ -314,11 +267,6 @@ this.defineLater = defineLater; } - /** - * - * - */ - public Long getToolContentId() { return this.toolContentId; } @@ -327,13 +275,6 @@ this.toolContentId = toolContentId; } - /** - * - * - * - * - */ - public Set getWikiSessions() { return this.wikiSessions; } @@ -342,14 +283,6 @@ this.wikiSessions = wikiSessions; } - /** - * - * asc" - * - * - * - */ - public Set getWikiPages() { return wikiPages; } @@ -358,38 +291,22 @@ this.wikiPages = wikiPages; } - /** - * - * - * - */ public WikiPage getMainPage() { return mainPage; } public void setMainPage(WikiPage mainPage) { this.mainPage = mainPage; } - - - /** - * - * @return - */ + public Date getSubmissionDeadline() { - return submissionDeadline; - } - + return submissionDeadline; + } - public void setSubmissionDeadline(Date submissionDeadline) { - this.submissionDeadline = submissionDeadline; - } - - /** - * toString - * - * @return String - */ + public void setSubmissionDeadline(Date submissionDeadline) { + this.submissionDeadline = submissionDeadline; + } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java (.../WikiPage.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPage.java (.../WikiPage.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -3,6 +3,18 @@ import java.util.HashSet; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** @@ -13,28 +25,51 @@ * @author lfoxton * */ +@Entity +@Table(name = "tl_lawiki10_wiki_page") public class WikiPage implements java.io.Serializable, Cloneable { private static final long serialVersionUID = 2980989002817635889L; private static Logger log = Logger.getLogger(WikiPage.class.getName()); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @ManyToOne + @JoinColumn(name = "wiki_uid") private Wiki parentWiki; + + @Column private String title; + + @Column private Boolean editable; + + @Column private Boolean deleted; + + @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) + @JoinColumn(name = "wiki_page_uid") + @OrderBy("uid ASC") private Set wikiContentVersions; + + @ManyToOne + @JoinColumn(name = "wiki_current_content") private WikiPageContent currentWikiContent; + + @ManyToOne + @JoinColumn(name = "wiki_session_uid") private WikiSession wikiSession; + + @ManyToOne + @JoinColumn(name = "added_by") private WikiUser addedBy; public WikiPage() { } - /** - * - * - */ public Long getUid() { return uid; } @@ -43,11 +78,6 @@ this.uid = uid; } - /** - * - * - * - */ public Wiki getParentWiki() { return parentWiki; } @@ -56,10 +86,6 @@ this.parentWiki = parentWiki; } - /** - * - * - */ public String getTitle() { return title; } @@ -68,10 +94,6 @@ this.title = title; } - /** - * - * - */ public Boolean getEditable() { return editable; } @@ -80,10 +102,6 @@ this.editable = editable; } - /** - * - * - */ public Boolean getDeleted() { return deleted; } @@ -92,13 +110,6 @@ this.deleted = deleted; } - /** - * - * - * - * - * - */ public Set getWikiContentVersions() { return wikiContentVersions; } @@ -107,11 +118,6 @@ this.wikiContentVersions = wikiContentVersions; } - /** - * - * - * - */ public WikiPageContent getCurrentWikiContent() { return currentWikiContent; } @@ -120,11 +126,6 @@ this.currentWikiContent = currentWikiContent; } - /** - * - * - * - */ public WikiUser getAddedBy() { return addedBy; } @@ -133,14 +134,6 @@ this.addedBy = addedBy; } - /** - * Gets the toolSession - * - * - * - * - * - */ public WikiSession getWikiSession() { return wikiSession; } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.java (.../WikiPageContent.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.java (.../WikiPageContent.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -25,6 +25,15 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** @@ -35,17 +44,34 @@ * @author lfoxton * */ +@Entity +@Table(name = "tl_lawiki10_wiki_page_content") public class WikiPageContent implements java.io.Serializable, Cloneable { private static final long serialVersionUID = 98276541234892314L; private static Logger log = Logger.getLogger(WikiPageContent.class.getName()); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @ManyToOne + @JoinColumn(name = "wiki_page_uid") private WikiPage wikiPage; + + @Column private String body; + + @ManyToOne + @JoinColumn(name = "editor") private WikiUser editor; + + @Column(name = "edit_date") private Date editDate; + + @Column private Long version; public WikiPageContent() { Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java (.../WikiSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java (.../WikiSession.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -28,6 +28,17 @@ import java.util.HashSet; import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** @@ -36,38 +47,48 @@ * * */ - +@Entity +@Table(name = "tl_lawiki10_session") public class WikiSession implements java.io.Serializable { private static Logger log = Logger.getLogger(WikiSession.class); - /** - * - */ - private static final long serialVersionUID = 7762187772612318324L; + private static final long serialVersionUID = 7762187772612318324L; - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "session_end_date") private Date sessionEndDate; + @Column(name = "session_start_date") private Date sessionStartDate; + @Column private Integer status; + @Column(name = "session_id") private Long sessionId; + @Column(name = "session_name") private String sessionName; + @ManyToOne + @JoinColumn(name = "wiki_uid") private Wiki wiki; + @OneToMany(mappedBy = "wikiSession") private Set wikiUsers; + @OneToMany(mappedBy = "wikiSession") + @OrderBy("uid ASC") private Set wikiPages; // Need a runtime copy for each wikiPage + @ManyToOne + @JoinColumn(name = "wiki_main_page_uid") private WikiPage mainPage; //Need a runtime reference to the main page - // Constructors - /** default constructor */ public WikiSession() { } @@ -85,12 +106,6 @@ this.wikiPages = wikiPages; } - // Property accessors - /** - * - * - */ - public Long getUid() { return this.uid; } @@ -99,11 +114,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getSessionEndDate() { return this.sessionEndDate; } @@ -112,11 +122,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - */ - public Date getSessionStartDate() { return this.sessionStartDate; } @@ -125,11 +130,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * - */ - public Integer getStatus() { return this.status; } @@ -138,11 +138,6 @@ this.status = status; } - /** - * - * - */ - public Long getSessionId() { return this.sessionId; } @@ -151,11 +146,6 @@ this.sessionId = sessionId; } - /** - * - * - */ - public String getSessionName() { return this.sessionName; } @@ -164,12 +154,6 @@ this.sessionName = sessionName; } - /** - * - * - * - */ - public Wiki getWiki() { return this.wiki; } @@ -178,13 +162,6 @@ this.wiki = wiki; } - /** - * - * - * - * - */ - public Set getWikiUsers() { return this.wikiUsers; } @@ -193,13 +170,6 @@ this.wikiUsers = wikiUsers; } - /** - * - * asc" - * - * - * - */ public Set getWikiPages() { return wikiPages; } @@ -208,11 +178,6 @@ this.wikiPages = wikiPages; } - /** - * - * - * - */ public WikiPage getMainPage() { return mainPage; } @@ -221,11 +186,6 @@ this.mainPage = mainPage; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java (.../WikiUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java (.../WikiUser.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -24,6 +24,15 @@ package org.lamsfoundation.lams.tool.wiki.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** @@ -35,30 +44,40 @@ * */ +@Entity +@Table(name = "tl_lawiki10_user") public class WikiUser implements java.io.Serializable { - /** - * - */ - private static final long serialVersionUID = -534126658843778423L; + private static final long serialVersionUID = -534126658843778423L; - // Fields - private Long uid; + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long uid; + @Column(name = "user_id") private Long userId; + @Column(name = "last_name") private String lastName; + @Column(name = "first_name") private String firstName; + @Column(name = "login_name") private String loginName; + @ManyToOne + @JoinColumn(name = "wiki_session_uid") private WikiSession wikiSession; + @Column private boolean finishedActivity; + @Column(name = "entry_uid") private Long entryUID; + @Column(name = "wiki_edits") private Integer wikiEdits; // Constructors @@ -86,10 +105,6 @@ this.wikiEdits = 0; } - // Property accessors - /** - * - */ public Long getUid() { return this.uid; } @@ -98,10 +113,6 @@ this.uid = uid; } - /** - * - * - */ public Long getUserId() { return this.userId; } @@ -110,10 +121,6 @@ this.userId = userId; } - /** - * - * - */ public String getLastName() { return this.lastName; } @@ -122,10 +129,6 @@ this.lastName = lastName; } - /** - * - * - */ public String getLoginName() { return loginName; } @@ -134,10 +137,6 @@ this.loginName = loginName; } - /** - * - * - */ public String getFirstName() { return this.firstName; } @@ -146,9 +145,6 @@ this.firstName = firstName; } - /** - * - */ public boolean isFinishedActivity() { return finishedActivity; } @@ -157,11 +153,6 @@ this.finishedActivity = finishedActivity; } - /** - * - * - * - */ public WikiSession getWikiSession() { return this.wikiSession; } @@ -170,9 +161,6 @@ this.wikiSession = wikiSession; } - /** - * - */ public Long getEntryUID() { return entryUID; } @@ -181,9 +169,6 @@ this.entryUID = entryUID; } - /** - * - */ public Integer getWikiEdits() { return wikiEdits; } @@ -192,11 +177,6 @@ this.wikiEdits = wikiEdits; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java (.../IWikiService.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java (.../IWikiService.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -28,6 +28,8 @@ import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.tool.exception.DataMissingException; +import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.wiki.model.Wiki; import org.lamsfoundation.lams.tool.wiki.model.WikiPage; import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent; @@ -333,4 +335,7 @@ * @return */ String getLearnerContentFolder(Long toolSessionId, Long userId); + + /** Copied from ToolSessionManager so that LearningController can access it */ + public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException; } Fisheye: Tag 89c234fa5993540a1c125c31d3c57f00b7fb3efb refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java (.../LearningController.java) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.wiki.dto.WikiDTO; @@ -50,7 +49,6 @@ import org.lamsfoundation.lams.tool.wiki.model.WikiSession; import org.lamsfoundation.lams.tool.wiki.model.WikiUser; import org.lamsfoundation.lams.tool.wiki.service.IWikiService; -import org.lamsfoundation.lams.tool.wiki.service.WikiServiceProxy; import org.lamsfoundation.lams.tool.wiki.util.WikiConstants; import org.lamsfoundation.lams.tool.wiki.util.WikiException; import org.lamsfoundation.lams.tool.wiki.web.forms.LearningForm; @@ -355,12 +353,9 @@ + "and toolSessionID: " + toolSessionID); } - ToolSessionManager sessionMgrService = WikiServiceProxy - .getWikiSessionManager(applicationContext.getServletContext()); - String nextActivityUrl; try { - nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID, wikiUser.getUserId()); + nextActivityUrl = wikiService.leaveToolSession(toolSessionID, wikiUser.getUserId()); response.sendRedirect(nextActivityUrl); } catch (DataMissingException e) { throw new WikiException(e); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r89c234fa5993540a1c125c31d3c57f00b7fb3efb --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml (.../wikiApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml (.../wikiApplicationContext.xml) (revision 89c234fa5993540a1c125c31d3c57f00b7fb3efb) @@ -43,6 +43,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED