Merging DEV_TEMPORARY to HEAD (RenditionService)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-03-05 20:02:52 +00:00
parent ad84497735
commit bce28a5599
80 changed files with 10611 additions and 1815 deletions

View File

@@ -44,6 +44,7 @@ import org.springframework.context.ApplicationContext;
*/
public class TemplateServiceImplTest extends TestCase
{
private static final String TEMPLATE_1 = "org/alfresco/repo/template/test_template1.ftl";
private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private TemplateService templateService;
@@ -127,5 +128,4 @@ public class TemplateServiceImplTest extends TestCase
});
}
private static final String TEMPLATE_1 = "org/alfresco/repo/template/test_template1.ftl";
}