Index: lams_contentrepository/.classpath =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/.classpath (.../.classpath) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/.classpath (.../.classpath) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -22,5 +22,10 @@ + + + + + Index: lams_contentrepository/build.xml =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/build.xml (.../build.xml) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/build.xml (.../build.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -337,5 +337,26 @@ + + + + + + + + + + + + + + Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml (.../CrCredential.hbm.xml) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml (.../CrCredential.hbm.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -1,107 +1,83 @@ - + + - - - - - - - @hibernate.class + - true - - - - @hibernate.id - generator-class="identity" - type="java.lang.Long" + + + + + + - - - true - - - - - true - true - - @hibernate.property + - - - true - - @hibernate.property + unique="true" + /> + + - + /> - - - - - - @hibernate.set + - @hibernate.collection-key - column="credential_id" + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.contentrepository.CrWorkspaceCredential" - - - - - - + - + + + + + + Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml (.../CrNode.hbm.xml) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml (.../CrNode.hbm.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -1,161 +1,132 @@ - + + - - - - - - - - @hibernate.class + - true - - - - - - @hibernate.id - generator-class="identity" - type="java.lang.Long" + + + + + + + - - - true - - - - - true - true - - @hibernate.property + - - - true - true - - @hibernate.property + /> + + - - - true - true - - @hibernate.property + /> + + - - - true - true - - @hibernate.property + /> + + - - - - - - - - @hibernate.set + /> + + + + + + + + + + + - @hibernate.collection-key - column="node_id" + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.contentrepository.CrNodeVersion" - - - - - - - - - true - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="workspace_id" - - - - - - true - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="parent_nv_id" - - - - + + + + + + + + Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml (.../CrNodeVersion.hbm.xml) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml (.../CrNodeVersion.hbm.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -1,150 +1,99 @@ - + + - - - - - - - @hibernate.class + - true - - - - - - @hibernate.id - generator-class="identity" - type="java.lang.Long" + + + + + + + - - - true - - - - - true - true - - @hibernate.property + - - - true - true - - @hibernate.property + /> + + - + /> - - - - - true - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="node_id" - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @hibernate.set + + - @hibernate.collection-key - column="nv_id" + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty" - - - - - - + - + + + + + + Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml (.../CrNodeVersionProperty.hbm.xml) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml (.../CrNodeVersionProperty.hbm.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -1,113 +1,89 @@ - + + - - - - - - - @hibernate.class + - true - IValue - - - - - - @hibernate.id - generator-class="identity" - type="java.lang.Long" + + + + + + + - - - true - - - - - true - true - - @hibernate.property + - - - true - true - - @hibernate.property + /> + + - - - true - true - - @hibernate.property + /> + + - + /> - - - - - true - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="nv_id" - - - + + + - + + + + Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml (.../CrWorkspace.hbm.xml) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml (.../CrWorkspace.hbm.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -1,120 +1,91 @@ - + + - - - - - - - - @hibernate.class + - true - IWorkspace - - - - - - @hibernate.id - generator-class="identity" - type="java.lang.Long" + + + + + + + - - - true - - - - - true - true - - @hibernate.property + - + /> - - - - - - @hibernate.set + - @hibernate.collection-key - column="workspace_id" + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.contentrepository.CrWorkspaceCredential" - - - - - - - - - - @hibernate.set + + + + + - @hibernate.collection-key - column="workspace_id" + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.contentrepository.CrNode" - - - - - - + - + + + + + + Index: lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml (.../CrWorkspaceCredential.hbm.xml) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml (.../CrWorkspaceCredential.hbm.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -1,76 +1,69 @@ - + + - - - - - - - @hibernate.class + - true - - - - @hibernate.id - generator-class="identity" - type="java.lang.Long" + + + + + + + + + - - true - - + + + + - - - - - true - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="workspace_id" - - - - - - true - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="credential_id" - - - + - Index: lams_contentrepository/lib/ehcache/ehcache-1.1.jar =================================================================== diff -u Binary files differ Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java (.../CrCredential.java) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java (.../CrCredential.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -85,6 +85,8 @@ } /** + * bi-directional one-to-many association to CrWorkspaceCredential + * * @hibernate.set * lazy="true" * inverse="true" Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java =================================================================== diff -u -rd3f488ff70266c8a676e11ee261b74b7a4c43d51 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java (.../CrNode.java) (revision d3f488ff70266c8a676e11ee261b74b7a4c43d51) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java (.../CrNode.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -14,8 +14,9 @@ /** - * @hibernate.class - * table="lams_cr_node" + * @hibernate.class table="lams_cr_node" + * + * @hibernate.cache usage = "transactional" * */ public class CrNode implements Serializable { @@ -124,6 +125,7 @@ /** * @hibernate.property * column="created_date_time" + * type="java.sql.Timestamp" * length="14" * */ @@ -149,7 +151,9 @@ this.nextVersionId = nextVersionId; } - /** + /** + * bi-directional many-to-one association to CrWorkspace + * * @hibernate.many-to-one * not-null="true" * @hibernate.column name="workspace_id" @@ -165,9 +169,12 @@ /** * Get the parent node/version to this node. + * bi-directional many-to-one association to CrNodeVersion. * * @hibernate.many-to-one * not-null="true" + * lazy="false" + * inversion="true" * @hibernate.column name="parent_nv_id" * */ @@ -181,6 +188,8 @@ /** + * bi-directional one-to-many association to CrNodeVersion + * * @hibernate.set * lazy="false" * inverse="true" @@ -189,6 +198,8 @@ * column="node_id" * @hibernate.collection-one-to-many * class="org.lamsfoundation.lams.contentrepository.CrNodeVersion" + * @hibernate.collection-cache + * usage = "transactional" * */ public Set getCrNodeVersions() { @@ -290,12 +301,8 @@ public CrNodeVersion getNodeVersion(Long versionId) { - long start = System.currentTimeMillis(); - String key = "getNodeVersion "+versionId; - CrNodeVersion nodeVersion = null; Set nodeVersionSet = getCrNodeVersions(); - log.error(key+" gotSet "+(System.currentTimeMillis()-start)); if ( nodeVersionSet != null ) { Iterator iter = nodeVersionSet.iterator(); @@ -305,7 +312,6 @@ nodeVersion = findLatestVersion(iter); } } - log.error(key+" gotVersion "+(System.currentTimeMillis()-start)); return nodeVersion; } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java =================================================================== diff -u -rd3f488ff70266c8a676e11ee261b74b7a4c43d51 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision d3f488ff70266c8a676e11ee261b74b7a4c43d51) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -14,6 +14,7 @@ * @hibernate.class * table="lams_cr_node_version" * + * @hibernate.cache usage = "transactional" */ public class CrNodeVersion implements Serializable { @@ -78,6 +79,7 @@ /** * @hibernate.property * column="version_id" + * type="java.lang.Long" * length="20" * not-null="true" * @@ -93,6 +95,7 @@ /** * @hibernate.property * column="created_date_time" + * type="java.sql.Timestamp" * length="14" * */ @@ -105,6 +108,8 @@ } /** + * bi-directional many-to-one association to CrNode + * * @hibernate.many-to-one * not-null="true" * @hibernate.column name="node_id" @@ -119,6 +124,8 @@ } /** + * bi-directional one-to-many association to CrNodeVersionProperty + * * @hibernate.set * lazy="false" * inverse="true" @@ -127,7 +134,8 @@ * column="nv_id" * @hibernate.collection-one-to-many * class="org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty" - * + * @hibernate.collection-cache + * usage = "transactional" */ public Set getCrNodeVersionProperties() { return this.crNodeVersionProperties; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -16,7 +16,8 @@ /** * @hibernate.class * table="lams_cr_node_version_property" - * + * + * @hibernate.cache usage = "transactional" */ public class CrNodeVersionProperty implements IValue,Serializable { @@ -109,6 +110,8 @@ } /** + * bi-directional many-to-one association to CrNodeVersion + * * @hibernate.many-to-one * not-null="true" * @hibernate.column name="nv_id" Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java (.../CrWorkspace.java) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java (.../CrWorkspace.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -10,7 +10,8 @@ /** * @hibernate.class * table="lams_cr_workspace" - * + * + * @hibernate.cache usage = "transactional" */ public class CrWorkspace implements IWorkspace,Serializable { @@ -69,10 +70,9 @@ } /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" + * bi-directional one-to-many association to CrWorkspaceCredential + * + * @hibernate.set lazy="true" inverse="true" cascade="none" * @hibernate.collection-key * column="workspace_id" * @hibernate.collection-one-to-many @@ -88,10 +88,9 @@ } /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" + * bi-directional one-to-many association to CrNode + * + * @hibernate.set lazy="true" inverse="true" cascade="none" * @hibernate.collection-key * column="workspace_id" * @hibernate.collection-one-to-many Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java (.../CrWorkspaceCredential.java) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java (.../CrWorkspaceCredential.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -49,8 +49,10 @@ } /** - * @hibernate.many-to-one - * not-null="true" + * bi-directional many-to-one association to CrWorkspace + * + * @hibernate.many-to-one not-null="true" + * * @hibernate.column name="workspace_id" * */ @@ -63,8 +65,10 @@ } /** - * @hibernate.many-to-one - * not-null="true" + * bi-directional many-to-one association to CrCredential + * + * @hibernate.many-to-one not-null="true" + * * @hibernate.column name="credential_id" * */ Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleRepository.java =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleRepository.java (.../SimpleRepository.java) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleRepository.java (.../SimpleRepository.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -320,12 +320,8 @@ * Does not cache the node. If versionId is null, then gets the latest version. * @throws ItemNotFoundException*/ private SimpleVersionedNode getNode(Long workspaceId, Long uuid, Long versionId) throws ItemNotFoundException { - long start = System.currentTimeMillis(); - String key = "getNode "+uuid; SimpleVersionedNode dbNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class); - log.error(key+" beanCreated "+(System.currentTimeMillis()-start)); dbNode.loadData(workspaceId, uuid,versionId); - log.error(key+" loadedData "+(System.currentTimeMillis()-start)); return dbNode; } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionedNode.java =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionedNode.java (.../SimpleVersionedNode.java) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionedNode.java (.../SimpleVersionedNode.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -148,12 +148,9 @@ node = null; nodeVersion = null; - long start = System.currentTimeMillis(); - String key = "loadData "+uuid; - try { node = (CrNode) nodeDAO.find(CrNode.class, uuid); - log.error(key+" nodeRetrieved "+(System.currentTimeMillis()-start)); + } catch (HibernateObjectRetrievalFailureException e ) { } @@ -176,13 +173,12 @@ * to be created? */ nodeVersion = node.getNodeVersion(versionId); - log.error(key+" versionsRetrieved "+(System.currentTimeMillis()-start)); if ( nodeVersion == null ) { throw new ItemNotFoundException("No version " + ( versionId != null ? "#"+versionId.toString() : "") + "found for node"); } - + } @@ -704,24 +700,18 @@ public IVersionedNode getNode(String relPath) throws ItemNotFoundException { - String key = "getNode "+getUUID(); - long start = System.currentTimeMillis(); - log.error(key+" start 0"); - nodeObjectInitilised("Unable to get child node."); if ( log.isDebugEnabled() ) { log.debug("getNode for path "+relPath+" start."); } CrNode childNode = nodeDAO.findChildNode(nodeVersion, relPath); - log.error(key+" childNodeDB "+(System.currentTimeMillis()-start)); if ( childNode != null ) { SimpleVersionedNode newNode = (SimpleVersionedNode) beanFactory.getBean("node", SimpleVersionedNode.class); newNode.node = childNode; newNode.nodeVersion = childNode.getNodeVersion(null); // get latest and only version - log.error(key+" returningNode "+(System.currentTimeMillis()-start)); return (IVersionedNode) newNode; } else { throw new ItemNotFoundException("Unable to find node with path "+relPath Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java =================================================================== diff -u -rd3f488ff70266c8a676e11ee261b74b7a4c43d51 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java (.../NodeDAO.java) (revision d3f488ff70266c8a676e11ee261b74b7a4c43d51) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java (.../NodeDAO.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -83,17 +83,12 @@ */ public CrNode findChildNode(CrNodeVersion parentNodeVersion, String relPath) { - long start = System.currentTimeMillis(); - if ( log.isDebugEnabled() ) log.debug("Getting child node from "+parentNodeVersion+" path "+relPath); - String queryString = "from CrNode as n where n.parentNodeVersion = ? and n.path = ? "; List nodes = getHibernateTemplate().find(queryString,new Object[] {parentNodeVersion, relPath}); - log.error("findChildNodeDBLookup"+(System.currentTimeMillis()-start)); - if(nodes.size() == 0){ log.debug("No nodes found"); return null; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/Download.java =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/Download.java (.../Download.java) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/Download.java (.../Download.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -148,7 +148,8 @@ version = RepositoryDispatchAction.getLong(request.getParameter(RepositoryDispatchAction.VERSION_NAME)); IVersionedNode node = getFileItem(ticket, uuid, version,null); - log.error(callId+" getFileItem1 "+(System.currentTimeMillis()-start)); + log.debug(callId+" getFileItem1 "+(System.currentTimeMillis()-start)); + // update versionId in case it was null and we got the latest version... version = node.getVersion(); @@ -208,9 +209,9 @@ return; } - log.error(callId+" beforeGetFileItem2 "+(System.currentTimeMillis()-start)); + log.debug(callId+" beforeGetFileItem2 "+(System.currentTimeMillis()-start)); IVersionedNode node = getFileItem(ticket, uuid, version, relPathString); - log.error(callId+" getFileItem2 "+(System.currentTimeMillis()-start)); + log.debug(callId+" getFileItem2 "+(System.currentTimeMillis()-start)); if ( ! node.isNodeType(NodeType.FILENODE) ) { errorInContent(request, response,"Unexpected type of node " +node.getNodeType()+" Expected File node. Data is "+node,null); @@ -220,7 +221,7 @@ } - log.error(callId+" handleFileNode "+(System.currentTimeMillis()-start)); + log.debug(callId+" handleFileNode "+(System.currentTimeMillis()-start)); } Index: lams_contentrepository/src/java/treecache.xml =================================================================== diff -u -rf753f75b21cc32230f53d50c509c4ca23cb4aec4 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/src/java/treecache.xml (.../treecache.xml) (revision f753f75b21cc32230f53d50c509c4ca23cb4aec4) +++ lams_contentrepository/src/java/treecache.xml (.../treecache.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -110,8 +110,9 @@ - - + + + @@ -123,8 +124,8 @@ 1000 - 200 - 900 + 200 + 900 Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java (.../BaseTestCase.java) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java (.../BaseTestCase.java) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -53,7 +53,7 @@ // this is run for each test so once we have it, we don't // want to get it again! if ( context == null ) { - context = new ClassPathXmlApplicationContext(IRepository.REPOSITORY_CONTEXT_PATH); + context = new ClassPathXmlApplicationContext("/org/lamsfoundation/lams/contentrepository/testContentRepositoryApplicationContext.xml"); } if ( repository == null ) { Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/testContentRepositoryApplicationContext.xml =================================================================== diff -u --- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/testContentRepositoryApplicationContext.xml (revision 0) +++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/testContentRepositoryApplicationContext.xml (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + /org/lamsfoundation/lams/contentrepository/dbConnection.properties + + + + + messages + + + + + + + + + + ${jdbc.driverClassName} + ${jdbc.url} + ${jdbc.username} + ${jdbc.password} + + + + + + + + org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml + org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml + org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml + org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml + org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml + org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml + + + + + ${hibernate.dialect} + ${hibernate.show_sql} + ${hibernate.c3p0.minPoolSize} + ${hibernate.c3p0.maxPoolSize} + ${hibernate.c3p0.timeout} + ${hibernate.c3p0.max_statement} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_SUPPORTS,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_SUPPORTS,-RepositoryCheckedException,-RepositoryRuntimeException + + PROPAGATION_REQUIRED,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException + PROPAGATION_REQUIRED,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + D:\repository + + + Index: lams_contentrepository/xdoclet-build.xml =================================================================== diff -u -r09decccca1a4d871be5772d51638fa13aa928349 -rd425e72f4a45b00ef77cc0a6b7e2331a36907478 --- lams_contentrepository/xdoclet-build.xml (.../xdoclet-build.xml) (revision 09decccca1a4d871be5772d51638fa13aa928349) +++ lams_contentrepository/xdoclet-build.xml (.../xdoclet-build.xml) (revision d425e72f4a45b00ef77cc0a6b7e2331a36907478) @@ -41,5 +41,17 @@ - + + + + + + + + + + +