inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
12994: Merged V3.0 to V3.1
      12931: Merged V2.2 to V3.0
         12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
         12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
         12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
         12759: AVM - build/test fix - follow-on to r12742
         12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
      12932: Merged V2.2 to V3.0   
         12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
         12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
         12809: Test fixes after r 12782
         12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
      12933: Merged V2.2 to V3.0
         12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
      12934: Merged V2.2 to V3.0
         12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
      12935: Merged V2.2 to V3.0
         12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
         12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
      12936: Merged V2.2 to V3.0
         12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
      12937: Merged V2.2 to V3.0
         12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
         12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
         12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
         12850: ETWOTWO-975 - Show Conflicts in Modified Items List
         12938: Fix merge typo (follow on from r12931)
         12941: Fix merge typo (follow on from r12931)
   12998: Cleaned up svn:mergeinfo entries
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
      Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
      Merged /alfresco/BRANCHES/V3.1:r12994,12998


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 02:50:32 +00:00
parent 37d3c2e25e
commit 6eb1963971
34 changed files with 972 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java
View File

@@ -31,15 +31,19 @@ import org.alfresco.repo.avm.ChildEntryImpl;
import org.alfresco.repo.avm.ChildEntryDAO;
import org.alfresco.repo.avm.ChildKey;
import org.alfresco.repo.avm.DirectoryNode;
import org.hibernate.Criteria;
import org.hibernate.FetchMode;
import org.hibernate.Query;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Restrictions;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* The Hibernate version of the ChildEntry DAO.
*
* @author britt
*/
class ChildEntryDAOHibernate extends HibernateDaoSupport implements
ChildEntryDAO
class ChildEntryDAOHibernate extends HibernateDaoSupport implements ChildEntryDAO
{
/**
* Do nothing constructor.
@@ -51,7 +55,9 @@ class ChildEntryDAOHibernate extends HibernateDaoSupport implements
/**
* Save an unsaved ChildEntry.
* @param entry The entry to save.
*
* @param entry
* The entry to save.
*/
public void save(ChildEntry entry)
{
@@ -60,64 +66,78 @@ class ChildEntryDAOHibernate extends HibernateDaoSupport implements
/**
* Get an entry by name and parent.
* @param name The name of the child to find.
* @param parent The parent to look in.
*
* @param name
* The name of the child to find.
* @param parent
* The parent to look in.
* @return The ChildEntry or null if not foun.
*/
public ChildEntry get(ChildKey key)
{
SessionCacheChecker.instance.check();
return (ChildEntry)getSession().get(ChildEntryImpl.class, key);
return (ChildEntry) getSession().get(ChildEntryImpl.class, key);
}
/**
* Get all the children of a given parent.
* @param parent The parent.
*
* @param parent
* The parent.
* @return A List of ChildEntries.
*/
@SuppressWarnings("unchecked")
public List<ChildEntry> getByParent(DirectoryNode parent)
{
Query query =
getSession().createQuery("from ChildEntryImpl ce where ce.key.parent = :parent");
query.setEntity("parent", parent);
return (List<ChildEntry>)query.list();
Criteria criteria = getSession().createCriteria(ChildEntryImpl.class, "ce");
criteria.add(Restrictions.eq("ce.key.parent", parent));
criteria.createCriteria("child", "cld").setFetchMode("ce.child", FetchMode.JOIN);
criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
// Query query =
// getSession().createQuery("select ce, cld from ChildEntryImpl ce join child cld where ce.key.parent =
// :parent");
// query.setEntity("parent", parent);
return (List<ChildEntry>) criteria.list();
}
/**
* Get the entry for a given child in a given parent.
* @param parent The parent.
* @param child The child.
*
* @param parent
* The parent.
* @param child
* The child.
* @return The ChildEntry or null.
*/
public ChildEntry getByParentChild(DirectoryNode parent, AVMNode child)
{
Query query =
getSession().createQuery("from ChildEntryImpl ce where ce.key.parent = :parent " +
"and ce.child = :child");
Query query = getSession().createQuery("from ChildEntryImpl ce where ce.key.parent = :parent " + "and ce.child = :child");
query.setEntity("parent", parent);
query.setEntity("child", child);
SessionCacheChecker.instance.check();
return (ChildEntry)query.uniqueResult();
return (ChildEntry) query.uniqueResult();
}
/**
* Get all the ChildEntries corresponding to the given child.
* @param child The child for which to look up entries.
*
* @param child
* The child for which to look up entries.
* @return The matching entries.
*/
@SuppressWarnings("unchecked")
public List<ChildEntry> getByChild(AVMNode child)
{
Query query = getSession().createQuery("from ChildEntryImpl ce " +
"where ce.child = :child");
Query query = getSession().createQuery("from ChildEntryImpl ce " + "where ce.child = :child");
query.setEntity("child", child);
return (List<ChildEntry>)query.list();
return (List<ChildEntry>) query.list();
}
/**
* Update a dirty ChildEntry.
* @param child The dirty entry.
*
* @param child
* The dirty entry.
*/
public void update(ChildEntry child)
{
@@ -126,17 +146,20 @@ class ChildEntryDAOHibernate extends HibernateDaoSupport implements
/**
* Delete one.
* @param child The one to delete.
*
* @param child
* The one to delete.
*/
public void delete(ChildEntry child)
{
getSession().delete(child);
}
// TODO Does this have dangerous interactions with the cache?
/**
* Delete all children of the given parent.
* @param parent The parent.
*
* @param parent
* The parent.
*/
public void deleteByParent(AVMNode parent)
{
@@ -145,7 +168,9 @@ class ChildEntryDAOHibernate extends HibernateDaoSupport implements
delete.executeUpdate();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see org.alfresco.repo.avm.ChildEntryDAO#evict(org.alfresco.repo.avm.ChildEntry)
*/
public void evict(ChildEntry entry)