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

RM: Removal of System out's and replace with logging.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0-BUG-FIX@39591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-07-23 06:45:59 +00:00
parent 4c088728b1
commit df9dbbd33a
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2012 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -45,8 +45,9 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
{ {
private static Log logger = LogFactory.getLog(RMMethodSecurityPostProcessor.class); private static Log logger = LogFactory.getLog(RMMethodSecurityPostProcessor.class);
public static final String RM_BEAN_NAME_PREFIX = "RM_";
public static final String PROP_OBJECT_DEFINITION_SOURCE = "objectDefinitionSource"; public static final String PROP_OBJECT_DEFINITION_SOURCE = "objectDefinitionSource";
public static final String PROPERTY_PREFIX = "rm.methodsecurity.";
public static final String SECURITY_BEAN_POSTFIX = "_security";
/** Security bean names */ /** Security bean names */
private Set<String> securityBeanNames; private Set<String> securityBeanNames;
@@ -85,7 +86,10 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
{ {
if (beanFactory.containsBeanDefinition(bean) == true) if (beanFactory.containsBeanDefinition(bean) == true)
{ {
System.out.println("For security bean defintion: " + bean); if (logger.isDebugEnabled() == true)
{
logger.debug("Adding RM method security definitions for " + bean);
}
BeanDefinition beanDef = beanFactory.getBeanDefinition(bean); BeanDefinition beanDef = beanFactory.getBeanDefinition(bean);
PropertyValue beanValue = beanDef.getPropertyValues().getPropertyValue(PROP_OBJECT_DEFINITION_SOURCE); PropertyValue beanValue = beanDef.getPropertyValues().getPropertyValue(PROP_OBJECT_DEFINITION_SOURCE);
@@ -96,6 +100,12 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
} }
} }
/**
* Get all the security bean names by looking at the property values set.
*
* @param beanFactory
* @return
*/
private Set<String> getSecurityBeanNames(ConfigurableListableBeanFactory beanFactory) private Set<String> getSecurityBeanNames(ConfigurableListableBeanFactory beanFactory)
{ {
if (securityBeanNameCache == null) if (securityBeanNameCache == null)
@@ -110,9 +120,14 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
{ {
String[] split = ((String)key).split("\\."); String[] split = ((String)key).split("\\.");
int index = split.length - 2; int index = split.length - 2;
String securityBeanName = split[index] + "_security"; String securityBeanName = split[index] + SECURITY_BEAN_POSTFIX;
if (securityBeanNameCache.contains(securityBeanName) == false && beanFactory.containsBean(securityBeanName) == true) if (securityBeanNameCache.contains(securityBeanName) == false && beanFactory.containsBean(securityBeanName) == true)
{ {
if (logger.isDebugEnabled() == true)
{
logger.debug("Adding " + securityBeanName + " to list from properties.");
}
securityBeanNameCache.add(securityBeanName); securityBeanNameCache.add(securityBeanName);
} }
} }
@@ -133,7 +148,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
for (Map.Entry<String, String> entry : map.entrySet()) for (Map.Entry<String, String> entry : map.entrySet())
{ {
String key = entry.getKey(); String key = entry.getKey();
String propKey = "rm.methodsecurity." + key; String propKey = PROPERTY_PREFIX + key;
if (properties.containsKey(propKey) == true) if (properties.containsKey(propKey) == true)
{ {
map.put(key, entry.getValue() + "," + properties.getProperty(propKey)); map.put(key, entry.getValue() + "," + properties.getProperty(propKey));
@@ -144,7 +159,6 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor
{ {
logger.warn("Missing RM security definition for method " + key); logger.warn("Missing RM security definition for method " + key);
} }
System.out.println("Missing RM security definition for method " + key);
} }
} }

3
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java
View File

@@ -18,8 +18,11 @@
*/ */
package org.alfresco.module.org_alfresco_module_rm.test.security; package org.alfresco.module.org_alfresco_module_rm.test.security;
import java.net.URL;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.apache.log4j.PropertyConfigurator;
/** /**
* Tests method level security of core alfresco services. * Tests method level security of core alfresco services.