Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
===================================================================
diff -u -r0913afb336848e1d400326b0219be2a1d301cab8 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java (.../Download.java) (revision 0913afb336848e1d400326b0219be2a1d301cab8)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java (.../Download.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -32,19 +32,15 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
import org.lamsfoundation.lams.contentrepository.FileException;
import org.lamsfoundation.lams.contentrepository.ITicket;
import org.lamsfoundation.lams.contentrepository.IValue;
import org.lamsfoundation.lams.contentrepository.IVersionedNode;
-import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
import org.lamsfoundation.lams.contentrepository.NodeType;
import org.lamsfoundation.lams.contentrepository.PropertyName;
import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
import org.lamsfoundation.lams.contentrepository.ValueFormatException;
import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
/**
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java (.../ICredentialDAO.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java (.../ICredentialDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -25,8 +25,9 @@
import org.lamsfoundation.lams.contentrepository.ICredentials;
import org.lamsfoundation.lams.contentrepository.IWorkspace;
import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException;
+import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO;
-public interface ICredentialDAO {
+public interface ICredentialDAO extends IBaseDAO {
/** Check the supplied credential to the workspace.
* By doing the check at this level, the password does
@@ -44,12 +45,6 @@
*/
public abstract boolean checkCredential(ICredentials credential) throws RepositoryRuntimeException;
- public abstract void insert(Object object);
-
- public abstract void update(Object object);
-
- public abstract void delete(Object object);
-
public abstract CrCredential findByName(String name);
}
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java
===================================================================
diff -u -r1492a6385b0f6e855ce08f2fe7570b4af8b53b21 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java (.../INodeDAO.java) (revision 1492a6385b0f6e855ce08f2fe7570b4af8b53b21)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java (.../INodeDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -20,29 +20,20 @@
*/
package org.lamsfoundation.lams.contentrepository.dao;
-import java.io.Serializable;
import java.util.List;
import org.lamsfoundation.lams.contentrepository.CrNode;
import org.lamsfoundation.lams.contentrepository.CrNodeVersion;
+import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO;
/**
* Data access routines for Nodes, versions and properties
*
* @author Fiona Malikoff
*/
-public interface INodeDAO {
+public interface INodeDAO extends IBaseDAO {
- public Object find(Class objClass, Serializable id);
-
public void saveOrUpdate(Object object);
-
- public void update(Object object);
-
- public void delete(Object object);
-
- public List findAll(Class objClass);
-
public List findChildNodes(CrNodeVersion parentNodeVersion);
public CrNode findChildNode(CrNodeVersion parentNodeVersion, String relPath);
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java (.../IWorkspaceDAO.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IWorkspaceDAO.java (.../IWorkspaceDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -25,14 +25,15 @@
import java.util.List;
import org.lamsfoundation.lams.contentrepository.CrWorkspace;
+import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO;
/**
* Data access routines for Workspaces.
*
* @author Fiona Malikoff
*/
-public interface IWorkspaceDAO {
+public interface IWorkspaceDAO extends IBaseDAO {
/** Get a workspace.
*
@@ -61,12 +62,5 @@
*/
public Object find(Class objClass, Serializable id);
- public void insert(Object object);
-
- public void update(Object object);
-
- public void delete(Object object);
-
- public List findAll(Class objClass);
}
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -27,16 +27,15 @@
import java.sql.SQLException;
import java.util.List;
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
-
import org.apache.log4j.Logger;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
import org.lamsfoundation.lams.contentrepository.CrCredential;
import org.lamsfoundation.lams.contentrepository.ICredentials;
import org.lamsfoundation.lams.contentrepository.IWorkspace;
import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException;
import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
/**
@@ -46,7 +45,7 @@
* @author Fiona Malikoff
*
*/
-public class CredentialDAO extends HibernateDaoSupport implements ICredentialDAO {
+public class CredentialDAO extends BaseDAO implements ICredentialDAO {
protected Logger log = Logger.getLogger(CredentialDAO.class);
@@ -155,18 +154,6 @@
return credentialMatched;
}
- public void insert(Object object) {
- this.getHibernateTemplate().save(object);
- }
-
- public void update(Object object) {
- this.getHibernateTemplate().update(object);
- }
-
- public void delete(Object object) {
- this.getHibernateTemplate().delete(object);
- }
-
public CrCredential findByName(String name) {
log.debug("Getting credential for name "+name);
@@ -181,9 +168,4 @@
return (CrCredential)credentials.get(0);
}
}
- public List findAll(Class objClass) {
- String query="from obj in class " + objClass.getName();
- return this.getHibernateTemplate().find(query);
- }
-
}
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java
===================================================================
diff -u -r8fe03be36398979de21121946d3ce1139dd39680 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java (.../NodeDAO.java) (revision 8fe03be36398979de21121946d3ce1139dd39680)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java (.../NodeDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -21,14 +21,13 @@
package org.lamsfoundation.lams.contentrepository.dao.hibernate;
-import java.io.Serializable;
import java.util.List;
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.contentrepository.CrNode;
import org.lamsfoundation.lams.contentrepository.CrNodeVersion;
import org.lamsfoundation.lams.contentrepository.dao.INodeDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
@@ -37,30 +36,13 @@
*
* @author Fiona Malikoff
*/
-public class NodeDAO extends HibernateDaoSupport implements INodeDAO {
+public class NodeDAO extends BaseDAO implements INodeDAO {
protected Logger log = Logger.getLogger(NodeDAO.class);
- public Object find(Class objClass, Serializable id) {
- return this.getHibernateTemplate().load(objClass,id);
- }
-
public void saveOrUpdate(Object object) {
this.getHibernateTemplate().saveOrUpdate(object);
}
-
- public void update(Object object) {
- this.getHibernateTemplate().update(object);
- }
-
- public void delete(Object object) {
- this.getHibernateTemplate().delete(object);
- }
-
- public List findAll(Class objClass) {
- String query="from obj in class " + objClass.getName();
- return this.getHibernateTemplate().find(query);
- }
/** Get all child nodes for a node/version.
*
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -30,8 +30,8 @@
import org.lamsfoundation.lams.contentrepository.CrWorkspace;
import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO;
-import org.springframework.orm.hibernate.HibernateObjectRetrievalFailureException;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
+import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException;
@@ -40,7 +40,7 @@
*
* @author Fiona Malikoff
*/
-public class WorkspaceDAO extends HibernateDaoSupport implements IWorkspaceDAO {
+public class WorkspaceDAO extends BaseDAO implements IWorkspaceDAO {
protected Logger log = Logger.getLogger(WorkspaceDAO.class);
@@ -87,29 +87,13 @@
public Object find(Class objClass, Serializable id) {
try {
- return this.getHibernateTemplate().load(objClass,id);
+ return super.find(objClass,id);
} catch (HibernateObjectRetrievalFailureException e ) {
return null;
}
}
- public void insert(Object object) {
- this.getHibernateTemplate().save(object);
- }
- public void update(Object object) {
- this.getHibernateTemplate().update(object);
- }
-
- public void delete(Object object) {
- this.getHibernateTemplate().delete(object);
- }
-
- public List findAll(Class objClass) {
- String query="from obj in class " + objClass.getName();
- return this.getHibernateTemplate().find(query);
- }
-
public void flushSession() throws RepositoryCheckedException {
try {
getSession().flush();
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java
===================================================================
diff -u -r8fe03be36398979de21121946d3ce1139dd39680 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision 8fe03be36398979de21121946d3ce1139dd39680)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -738,7 +738,7 @@
// check that the previous version was a file node - error otherwise
SimpleVersionedNode node = getNode(ticket.getWorkspaceId(),uuid,versionId);
node.setProperty(name, value, type);
- node.saveDB(null);
+ node.validateSaveDB(null);
}
/* (non-Javadoc)
@@ -757,6 +757,7 @@
+"Please delete the parent. Node UUID "+uuid);
}
List problemPaths = latestNodeVersion.deleteNode();
+ latestNodeVersion.saveDB(null);
return problemPaths != null ?
(String[]) problemPaths.toArray(new String[problemPaths.size()]) :
new String[0];
@@ -775,6 +776,7 @@
// get the first version of the node and delete from there.
SimpleVersionedNode nodeVersion = getNode(ticket.getWorkspaceId(),uuid,version);
List problemPaths = nodeVersion.deleteVersion();
+ nodeVersion.saveDB(null);
return problemPaths != null ?
(String[]) problemPaths.toArray(new String[problemPaths.size()]) :
new String[0];
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java
===================================================================
diff -u -r36a3488f8517a3143da11d93f287c782f7e758bd -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java (.../SimpleVersionedNode.java) (revision 36a3488f8517a3143da11d93f287c782f7e758bd)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java (.../SimpleVersionedNode.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -58,7 +58,6 @@
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.orm.hibernate.HibernateObjectRetrievalFailureException;
/**
@@ -187,12 +186,7 @@
node = null;
nodeVersion = null;
- try {
- node = (CrNode) nodeDAO.find(CrNode.class, uuid);
-
- } catch (HibernateObjectRetrievalFailureException e ) {
- }
-
+ node = (CrNode) nodeDAO.find(CrNode.class, uuid);
if ( node == null ) {
throw new ItemNotFoundException("Node "+uuid+" not found.");
@@ -365,9 +359,9 @@
return node.isNodeType(nodeTypeName);
}
- /** Get the history for this node. Quite intensive operation the
- * first time it is run on a node as it has to build all the
- * data structures.
+ /** Get the history for this node. Quite intensive operation
+ * as it has to build all the data structures. Can't be easily
+ * cached.
* @return SortedSet of IVersionDetail objects, ordered by version
*/
public SortedSet getVersionHistory() {
@@ -691,14 +685,24 @@
return node.getNodeId();
}
- /** Just save the db changes to the current node.
+
+ /** Validate the node and save the db changes to the current node.
+ * Do not use if there are files that have been updated - the validation may fail and we
+ * would end up in an odd state.
+ *
* If files have been added, please call Long save(String versionDescription, List childNodes).
- * This method will validate the node and save the database changes
- * @param versionDescription optional. If supplied will set the version description
+ * @param versionDescription optional. If supplied will set the version description
*/
- protected void saveDB(String versionDescription) throws ValidationException {
+ protected void validateSaveDB(String versionDescription) throws ValidationException {
validateNode();
+ saveDB(versionDescription);
+ }
+ /** Just save the db changes to the current node. See validateSaveDB()
+ * @param versionDescription optional. If supplied will set the version description
+ */
+ protected void saveDB(String versionDescription) {
+
// nodeDAO to take care of insert or update (uses saveOrUpdate)
// the nodeVersion and nodeVersionProperty collections cascade
// updates and deletes, so we can just save the node!
@@ -927,15 +931,17 @@
NodeKey nk = getNodeKey();
if ( node.getCrNodeVersions() != null ) {
- node.getCrNodeVersions().remove(nodeVersion);
+ boolean removed = node.removeCrNodeVersion(nodeVersion);
+ if ( removed ) {
+ nodeKeysDeleted.add(nk);
+ }
}
// if this was the last version for the node, delete the node
if ( node.getCrNodeVersions() == null || node.getCrNodeVersions().size() == 0 ) {
nodeDAO.delete(node);
}
- nodeKeysDeleted.add(nk);
}
/* **********************************************************
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java
===================================================================
diff -u -r36a3488f8517a3143da11d93f287c782f7e758bd -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java (.../TestToolContentHandlerImpl.java) (revision 36a3488f8517a3143da11d93f287c782f7e758bd)
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/client/TestToolContentHandlerImpl.java (.../TestToolContentHandlerImpl.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -56,42 +56,42 @@
handler = null;
}
- public void testGetRepositoryWorkspaceName() {
- assertEquals(handler.repositoryWorkspace,handler.getRepositoryWorkspaceName());
- }
+// public void testGetRepositoryWorkspaceName() {
+// assertEquals(handler.repositoryWorkspace,handler.getRepositoryWorkspaceName());
+// }
+//
+// public void testGetRepositoryUser() {
+// assertEquals(handler.repositoryUser,handler.getRepositoryUser());
+// }
+//
+// public void testGetRepositoryId() {
+// assertEquals(handler.repositoryId,handler.getRepositoryId());
+// }
+//
+// public void testGetRepositoryService() {
+// try {
+// assertNotNull(handler.getRepositoryService());
+// } catch ( Exception e ) {
+// e.printStackTrace();
+// fail("getRepService() threw exception "+e.getMessage());
+// }
+// }
+//
+// public void testGetTicket() {
+// try {
+// ITicket ticket1 = handler.getTicket(false);
+// // repeat call using false should get same ticket;
+// ITicket ticket2 = handler.getTicket(false);
+// assertSame(ticket1, ticket2);
+// // repeat call using true should get new ticket;
+// ITicket ticket3 = handler.getTicket(true);
+// assertNotSame(ticket1, ticket3);
+// } catch ( Exception e ) {
+// e.printStackTrace();
+// fail("getRepositoryId() threw exception "+e.getMessage());
+// }
+// }
- public void testGetRepositoryUser() {
- assertEquals(handler.repositoryUser,handler.getRepositoryUser());
- }
-
- public void testGetRepositoryId() {
- assertEquals(handler.repositoryId,handler.getRepositoryId());
- }
-
- public void testGetRepositoryService() {
- try {
- assertNotNull(handler.getRepositoryService());
- } catch ( Exception e ) {
- e.printStackTrace();
- fail("getRepService() threw exception "+e.getMessage());
- }
- }
-
- public void testGetTicket() {
- try {
- ITicket ticket1 = handler.getTicket(false);
- // repeat call using false should get same ticket;
- ITicket ticket2 = handler.getTicket(false);
- assertSame(ticket1, ticket2);
- // repeat call using true should get new ticket;
- ITicket ticket3 = handler.getTicket(true);
- assertNotSame(ticket1, ticket3);
- } catch ( Exception e ) {
- e.printStackTrace();
- fail("getRepositoryId() threw exception "+e.getMessage());
- }
- }
-
/* Creates an offline and online file, checks that the properties are correct and then deletes them. */
public void testUploadFile() {
try {
@@ -109,7 +109,7 @@
handler.deleteFile(uuid);
try {
node = handler.getFileNode(uuid);
- // fail("Expected ItemNotFoundException to be thrown when trying to access deleted offline file.");
+ fail("Expected ItemNotFoundException to be thrown when trying to access deleted offline file.");
} catch (ItemNotFoundException ie) {
assertTrue("Offline node cannot be retrieved after deletion",true);
}
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleRepository.java
===================================================================
diff -u -r36a3488f8517a3143da11d93f287c782f7e758bd -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleRepository.java (.../TestSimpleRepository.java) (revision 36a3488f8517a3143da11d93f287c782f7e758bd)
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/service/TestSimpleRepository.java (.../TestSimpleRepository.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -237,8 +237,8 @@
checkFileNodeExist(fileDAO, keys.getUuid(), two, 2);
deleteVersion(keys.getUuid(), two);
- checkFileNodeExist(fileDAO, keys.getUuid(), one, 1);
checkFileNodeDoesNotExist(fileDAO, keys.getUuid(), two, 1);
+ checkFileNodeExist(fileDAO, keys.getUuid(), one, 1);
deleteVersion(keys.getUuid(), one);
checkFileNodeDoesNotExist(fileDAO, keys.getUuid(), one, 0);
Index: lams_monitoring/build.xml
===================================================================
diff -u -rcf180d3aba89be0c4fba3f8c8f58dd50181de8c6 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/build.xml (.../build.xml) (revision cf180d3aba89be0c4fba3f8c8f58dd50181de8c6)
+++ lams_monitoring/build.xml (.../build.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -127,12 +127,14 @@
-
-
+
+
+
+
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -rf7b2dd6bd944a7f6286aeb748e999020b7b01a9b -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision f7b2dd6bd944a7f6286aeb748e999020b7b01a9b)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -88,7 +88,10 @@
/**
* Set the gate to open to let all the learners through. This learning service
- * is triggerred by the system scheduler.
+ * is triggerred by the system scheduler. Will return true GateActivity (or subclass)
+ * object, rather than a hibernate proxy. This is needed so that the class can
+ * be returned to the web layer for proper handling.
+ *
* @param gate the id of the gate we need to open.
*/
public GateActivity openGate(Long gateId);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
===================================================================
diff -u -r83751ccbd9c0d7db4e1c2f3e027646c41de5c29a -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java (.../GateAction.java) (revision 83751ccbd9c0d7db4e1c2f3e027646c41de5c29a)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java (.../GateAction.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -77,7 +77,7 @@
* @struts.action-exception key="error.system.monitor" scope="request"
* type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
* path=".systemError"
- * handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+ * handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
* @struts:action-forward name="viewSynchGate" path=".viewSynchGate"
* @struts:action-forward name="viewPermissionGate" path=".viewPermissionGate"
* @struts:action-forward name="viewScheduleGate" path=".viewScheduleGate"
@@ -144,12 +144,14 @@
{
DynaActionForm gateForm = (DynaActionForm)form;
+ long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID);
+
+ Long gateIdLong = (Long)gateForm.get("activityId");
+ long gateId = WebUtil.checkLong("activityId", gateIdLong);
+
this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
this.learnerService = MonitoringServiceProxy.getLearnerService(getServlet().getServletContext());
- long gateId = ((Long)gateForm.get("activityId")).longValue();
- long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID);
-
Activity gate = monitoringService.getActivityById(gateId);
//setup the total learners
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -rf7b2dd6bd944a7f6286aeb748e999020b7b01a9b -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision f7b2dd6bd944a7f6286aeb748e999020b7b01a9b)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -57,7 +57,7 @@
* @struts.action-exception key="error.system.monitor" scope="request"
* type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
* path=".systemError"
- * handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+ * handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
* @struts:action-forward name="scheduler" path="/TestScheduler.jsp"
* @struts.action-forward name = "success" path = "/index.jsp"
*
Index: lams_monitoring/test/java/log4j.properties
===================================================================
diff -u -r214a1446ca64680e16978f703dab68540a1c8a68 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/test/java/log4j.properties (.../log4j.properties) (revision 214a1446ca64680e16978f703dab68540a1c8a68)
+++ lams_monitoring/test/java/log4j.properties (.../log4j.properties) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -1,4 +1,4 @@
-log4j.rootLogger=INFO,stdout
+log4j.rootLogger=ERROR,stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %5p (%F:%L) - %m%n
\ No newline at end of file
Index: lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml (.../applicationContext.xml) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962)
+++ lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml (.../applicationContext.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -34,7 +34,7 @@
-
+
Index: lams_monitoring/test/web/WEB-INF/web.xml
===================================================================
diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_monitoring/test/web/WEB-INF/web.xml (.../web.xml) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e)
+++ lams_monitoring/test/web/WEB-INF/web.xml (.../web.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -61,7 +61,7 @@
HibernateFilter
- org.springframework.orm.hibernate.support.OpenSessionInViewFilter
+ org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
sessionFactoryBeanName
coreSessionFactory
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r3f881fb4927d02d9e124d95c09f15035a89b495b -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_forum/build.xml (.../build.xml) (revision 3f881fb4927d02d9e124d95c09f15035a89b495b)
+++ lams_tool_forum/build.xml (.../build.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -92,7 +92,7 @@
-
+
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml
===================================================================
diff -u -re16f09694ef763b1acafa32958762c90332b8228 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml (.../GenericEntity.hbm.xml) (revision e16f09694ef763b1acafa32958762c90332b8228)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml (.../GenericEntity.hbm.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -1,8 +1,8 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -rb463a05bbf22f9ae4ed2382974ea2f79d8b4709f -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_forum/src/java/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision b463a05bbf22f9ae4ed2382974ea2f79d8b4709f)
+++ lams_tool_forum/src/java/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -3,7 +3,7 @@
-
+
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml
===================================================================
diff -u -r69d3b8ec6001bdaa284a45a78ac481fc41ffed02 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml (.../testqaApplicationContext.xml) (revision 69d3b8ec6001bdaa284a45a78ac481fc41ffed02)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml (.../testqaApplicationContext.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -31,7 +31,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml
===================================================================
diff -u -ra2879d5fc870daa4732c0c9bf65cce24c0832c9f -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml (.../NoticeboardAttachment.hbm.xml) (revision a2879d5fc870daa4732c0c9bf65cce24c0832c9f)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml (.../NoticeboardAttachment.hbm.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -1,7 +1,7 @@
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-
+
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java
===================================================================
diff -u -rc37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java (.../NoticeboardAttachmentDAO.java) (revision c37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java (.../NoticeboardAttachmentDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -9,7 +9,7 @@
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardAttachmentDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* @author mtruong
*
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java
===================================================================
diff -u -rc37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision c37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -24,13 +24,13 @@
import java.util.List;
import java.lang.Long;
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO;
-import org.springframework.orm.hibernate.HibernateCallback;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* @author mtruong
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java
===================================================================
diff -u -rc37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision c37fcfa0e8e9c09a5ada45fba5af63e43b2bbef1)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -22,16 +22,16 @@
package org.lamsfoundation.lams.tool.noticeboard.dao.hibernate;
import java.util.List;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
-import org.springframework.orm.hibernate.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
-
/**
* @author mtruong
* Hibernate implementation for database access to Noticeboard sessions for the noticeboard tool.
@@ -138,7 +138,7 @@
user.setNbSession(session);
session.getNbUsers().add(user);
this.getHibernateTemplate().saveOrUpdate(user);
- this.getHibernateTemplate().saveOrUpdateCopy(session);
+ this.getHibernateTemplate().merge(session);
}
/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#getSessionsFromContent(org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java
===================================================================
diff -u -r981a75a7b464b24a0bd26b9864624fd34c534607 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 981a75a7b464b24a0bd26b9864624fd34c534607)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -28,7 +28,7 @@
import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
/**
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml
===================================================================
diff -u -r09f53aadc7e65fbbda0d3dc592c50621ac578a81 -r6e5832d17263bc6c6f7683733e91e22f97eab569
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml (.../testApplicationContext.xml) (revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml (.../testApplicationContext.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
@@ -15,7 +15,7 @@
-
+
@@ -27,7 +27,7 @@
- net.sf.hibernate.dialect.MySQLDialect
+ org.hibernate.dialect.MySQLDialect
false
5
20
@@ -40,7 +40,7 @@
-
+