Merged V4.0-BUG-FIX to HEAD

34319: Merged V4.0 to V4.0-BUG-FIX
      34313: ALF-13163: Merged V3.4-BUG-FIX to V4.0
         34311: Fix for ALF-13141 - Share: Flash Uploader doesn't work with tomcat 6.0.35: Script url /api/upload;jsessionid=539E3E7730B9E7DF56C4A235F2592385 not map to a Web Script.
      34318: ALF-13163: Merged V3.4-BUG-FIX to V4.0
         34316: Method signature change to ConfigService fixes for RepoXMLConfigService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-03-01 16:21:10 +00:00
parent 19c9d617a3
commit 7cbbcb9e03

View File

@@ -374,7 +374,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
} }
@Override @Override
protected Map<String, List<ConfigSection>> getSectionsByArea() public Map<String, List<ConfigSection>> getSectionsByArea()
{ {
return getConfigData().getSectionsByArea(); return getConfigData().getSectionsByArea();
} }
@@ -392,7 +392,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
} }
@Override @Override
protected List<ConfigSection> getSections() public List<ConfigSection> getSections()
{ {
return getConfigData().getSections(); return getConfigData().getSections();
} }