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

Merge 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4504 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4505 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4506 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4507 .
   svn resolved root\projects\core\source\java\log4j.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4548 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4549 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java
   svn resolved  root\projects\repository\source\java\org\alfresco\repo\jscript\CategoryTemplateNode.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4603 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4604 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 16:28:32 +00:00
parent 58ee1796a2
commit b3a235b6eb
6 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/alfresco/extension/custom-hibernate-dialect.properties.sample
View File

@@ -27,3 +27,9 @@
# SQLServer dialect # SQLServer dialect
# #
#hibernate.dialect=org.hibernate.dialect.SQLServerDialect #hibernate.dialect=org.hibernate.dialect.SQLServerDialect
#
# PostgreSQL dialect
#
#org.hibernate.dialect.PostgreSQLDialect
#hibernate.query.substitutions=true TRUE, false FALSE

2
source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
View File

@@ -240,7 +240,7 @@
join assoc.child as child join assoc.child as child
where where
assoc.parent.id = :parentId and assoc.parent.id = :parentId and
assoc.isPrimary = 1 assoc.isPrimary = true
) )
</query> </query>

2
source/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
View File

@@ -35,6 +35,8 @@ import org.alfresco.service.namespace.QName;
*/ */
public class CategoryTemplateNode extends TemplateNode public class CategoryTemplateNode extends TemplateNode
{ {
private static final long serialVersionUID = -2595282439089450151L;
/** /**
* Constructor * Constructor
* *

2
source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
View File

@@ -32,8 +32,6 @@ import org.alfresco.service.cmr.repository.TemplateNode;
import org.alfresco.service.cmr.repository.TemplateProcessor; import org.alfresco.service.cmr.repository.TemplateProcessor;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import bsh.This;
import freemarker.cache.MruCacheStorage; import freemarker.cache.MruCacheStorage;
import freemarker.cache.StringTemplateLoader; import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration; import freemarker.template.Configuration;

1
source/java/org/alfresco/repo/template/TemplateServiceImplTest.java
View File

@@ -103,6 +103,7 @@ public class TemplateServiceImplTest extends TestCase
transactionService, transactionService,
new TransactionUtil.TransactionWork<Object>() new TransactionUtil.TransactionWork<Object>()
{ {
@SuppressWarnings("unchecked")
public Object doWork() throws Exception public Object doWork() throws Exception
{ {
StoreRef store = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "template_" + System.currentTimeMillis()); StoreRef store = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "template_" + System.currentTimeMillis());

8
source/java/org/alfresco/service/cmr/repository/TemplateNode.java
View File

@@ -133,6 +133,14 @@ public class TemplateNode implements Serializable
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Node API // Node API
/**
* Gets the image resolver
*/
public TemplateImageResolver getImageResolver()
{
return imageResolver;
}
/** /**
* @return The GUID for the node * @return The GUID for the node
*/ */