mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
Merged from BRANCHES/DEV/KEVINR:
. Fix from Andy for jboss portal issue with audit component . Fix to AlfrescoFacesPortlet to work with JBossPortal2.4.1 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
parent
7e6d2c783d
commit
a3d3014467
@ -20,7 +20,7 @@
|
|||||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||||
* FLOSS exception. You should have recieved a copy of the text describing
|
* FLOSS exception. You should have recieved a copy of the text describing
|
||||||
* the FLOSS exception, and it is also available here:
|
* the FLOSS exception, and it is also available here:
|
||||||
* http://www.alfresco.com/legal/licensing"
|
* http://www.alfresco.com/legal/licensing
|
||||||
*/
|
*/
|
||||||
package org.alfresco.repo.audit;
|
package org.alfresco.repo.audit;
|
||||||
|
|
||||||
@ -36,6 +36,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|||||||
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
|
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
|
||||||
import org.alfresco.service.Auditable;
|
import org.alfresco.service.Auditable;
|
||||||
import org.alfresco.service.NotAuditable;
|
import org.alfresco.service.NotAuditable;
|
||||||
|
import org.alfresco.service.PublicService;
|
||||||
import org.alfresco.service.cmr.audit.AuditInfo;
|
import org.alfresco.service.cmr.audit.AuditInfo;
|
||||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
@ -188,7 +189,15 @@ public class AuditComponentImpl implements AuditComponent
|
|||||||
{
|
{
|
||||||
s_logger.debug("Unannotated service method " + serviceName + "." + methodName);
|
s_logger.debug("Unannotated service method " + serviceName + "." + methodName);
|
||||||
}
|
}
|
||||||
throw new RuntimeException("Unannotated service method " + serviceName + "." + methodName);
|
if (method.getDeclaringClass().isInterface()
|
||||||
|
&& method.getDeclaringClass().isAnnotationPresent(PublicService.class))
|
||||||
|
{
|
||||||
|
throw new RuntimeException("Unannotated service method " + serviceName + "." + methodName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return mi.proceed();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
Loading…
x
Reference in New Issue
Block a user