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.0 to HEAD

Browse Source 
11410: Activity Service - iBatis mapping files for MS SQL Server (using AlfrescoSQLServerDialect)
          Can be Enterprised when dual build is set up
   11414: Fix for missing servlet reference in repo web.xml
   11415: Activity Service - iBatis mapping files for new Oracle dialects (using AlfrescoOracle10gDialect or AlfrescoOracle9iDialect)
          Can be Entperprised when dual build is up
   11424: Remove conflicting java mail libraries.
          NOTE: Might affect 'CMIS web service implementation'
   11426: Activity Service - use lower-case columns
   11428: ETHREEOH-300: Site contributor can not delete his own blog posts
   11431: Removed tutorial from Guest home
   11432: ETHREEOH-198: SiteService is not MT enabled
   11440: Close all ScrollableResults in try{} finally{}
   11442: Fix for ETHREEOH-268, ETHREEOH-269, ETHREEOH-431, ETHREEOH-438, ETHREEOH-456, ETHREEOH-468, ETHREEOH-532
   11443: Update to JSF client Help URL
   11444: Build fix
   11447: MT - fix ETHREEOH-530
   11448: Fix for ETHREEOH-424: Edit Web Content: dojo.data.fromrfc3339 is not a function
   11449: Fix for ETHREEOH-218: DM forms should be disabled


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-12-17 06:49:28 +00:00
parent fc7a11387e
commit f74699749b
35 changed files with 1301 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -1349,7 +1349,7 @@ public class AVMServiceTest extends AVMServiceTestBase
StoreRef storeRef = AVMNodeConverter.ToStoreRef("main");
SearchService searchService = fIndexerAndSearcher.getSearcher(storeRef, true);
ResultSet results = searchService.query(storeRef, "lucene", "TEXT:\"tutorial\"");
ResultSet results = searchService.query(storeRef, "lucene", "@" + LuceneQueryParser.escape(ContentModel.PROP_NAME.toString()) + ":\"guest\"");
assertEquals(0, results.length());
results.close();
@@ -1363,7 +1363,7 @@ public class AVMServiceTest extends AVMServiceTestBase
fService.createSnapshot("main", null, null);
searchService = fIndexerAndSearcher.getSearcher(storeRef, true);
results = searchService.query(storeRef, "lucene", "TEXT:\"tutorial\"");
results = searchService.query(storeRef, "lucene", "@" + LuceneQueryParser.escape(ContentModel.PROP_NAME.toString()) + ":\"guest\"");
assertEquals(1, results.length());
results.close();

19
source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
View File

@@ -162,11 +162,22 @@ class AVMNodeDAOHibernate extends HibernateDaoSupport implements
public void getContentUrls(ContentUrlHandler handler)
{
Query query = getSession().getNamedQuery("PlainFileNode.GetContentUrls");
ScrollableResults results = query.scroll(ScrollMode.FORWARD_ONLY);
while (results.next())
ScrollableResults results = null;
try
{
String contentUrl = results.getText(0);
handler.handle(contentUrl);
results = query.scroll(ScrollMode.FORWARD_ONLY);
while (results.next())
{
String contentUrl = results.getText(0);
handler.handle(contentUrl);
}
}
finally
{
if (results != null)
{
results.close();
}
}
}