Index: ssts-web/src/main/resources/spring/applicationContext-common-authorization.xml
===================================================================
diff -u -r12331 -r12335
--- ssts-web/src/main/resources/spring/applicationContext-common-authorization.xml	(.../applicationContext-common-authorization.xml)	(revision 12331)
+++ ssts-web/src/main/resources/spring/applicationContext-common-authorization.xml	(.../applicationContext-common-authorization.xml)	(revision 12335)
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans 
-    http://www.springframework.org/schema/beans/spring-beans.xsd" default-autowire="byName">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+    http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context   
+    http://www.springframework.org/schema/context/spring-context.xsd"
+	default-autowire="byName">
 
    <!-- ~~~~~~~~~~~~~~~~~~ "BEFORE INVOCATION" AUTHORIZATION DEFINITIONS ~~~~~~~~~~~~~~~~ -->
 
@@ -19,278 +23,5 @@
    <bean id="org.springframework.security.acls.domain.BasePermission.DELETE" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
       <property name="staticField"><value>org.springframework.security.acls.domain.BasePermission.DELETE</value></property>
    </bean>
-
-
-   <!-- An access decision voter that reads ROLE_* configuration settings -->
-   <bean id="roleVoter" class="org.springframework.security.vote.RoleVoter"/>
-
-   <!-- An access decision voter that reads ACL_PUBLICINFORMATION_READ configuration settings -->
-   <bean id="aclPublicInformationReadVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_PUBLICINFORMATION_READ</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.READ"/>
-      	</list>
-      </constructor-arg>
-      <!-- property name="processDomainObjectClass"><value>com.forgon.oa.po.publicinformation.PublicInformation</value></property-->
-   </bean>
-
-   <!-- An access decision voter that reads ACL_PUBLICINFORMATION_DELETE configuration settings -->
-   <bean id="aclPublicInformationDeleteVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_PUBLICINFORMATION_DELETE</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.DELETE"/>
-      	</list>
-      </constructor-arg>
-      <property name="processDomainObjectClass"><value>com.forgon.oa.po.publicinformation.PublicInformation</value></property>
-   </bean>
-
-   <bean id="aclWorkflowFormDeleteVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_WORKFLOWFORM_DELETE</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.DELETE"/>
-      	</list>
-      </constructor-arg>
-      <property name="processDomainObjectClass"><value>com.forgon.workflow.form.WorkflowForm</value></property>
-   </bean>
-   
-   <!-- An access decision voter that reads ACL_PUBLICINFORMATION_ADMIN configuration settings -->
-   <bean id="aclPublicInformationAdminVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_PUBLICINFORMATION_ADMIN</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-      	</list>
-      </constructor-arg>
-      <!-- property name="processDomainObjectClass"><value>com.forgon.oa.po.publicinformation.PublicInformation</value></property-->
-   </bean>
-
-   <bean id="aclTreeNodeReadVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_TREENODE_READ</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.READ"/>
-      	</list>
-      </constructor-arg>
-      <!-- <property name="processDomainObjectClass"><value>com.forgon.knowledge.model.KnowledgeFolder</value></property> -->
-   </bean>
-
-   <!-- An access decision voter that reads ACL_PUBLICINFORMATION_DELETE configuration settings -->
-   <bean id="aclTreeNodeDeleteVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_TREENODE_DELETE</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.DELETE"/>
-      	</list>
-      </constructor-arg>
-      <!-- property name="processDomainObjectClass"><value>com.forgon.knowledge.model.KnowledgeFolder</value></property-->
-   </bean>
-
-   <!-- An access decision voter that reads ACL_PUBLICINFORMATION_ADMIN configuration settings -->
-   <bean id="aclTreeNodeAdminVoter" class="org.springframework.security.vote.AclEntryVoter">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<value>ACL_TREENODE_ADMIN</value>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-      	</list>
-      </constructor-arg>
-      <!-- property name="processDomainObjectClass"><value>com.forgon.knowledge.model.KnowledgeFolder</value></property-->
-   </bean>
-
-   <!-- An access decision manager used by the business objects -->
-   <bean id="businessAccessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
-      <property name="allowIfAllAbstainDecisions"><value>false</value></property>
-      <property name="decisionVoters">
-         <list>
-            <ref local="roleVoter"/>
-            <ref local="aclPublicInformationReadVoter"/>
-            <ref local="aclPublicInformationDeleteVoter"/>
-            <ref local="aclPublicInformationAdminVoter"/>
-            <ref local="aclTreeNodeReadVoter"/>
-            <ref local="aclTreeNodeDeleteVoter"/>
-            <ref local="aclTreeNodeAdminVoter"/>
-            <ref local="aclWorkflowFormDeleteVoter"/>
-         </list>
-      </property>
-   </bean>
-
-   <!-- ========= ACCESS CONTROL LIST LOOKUP MANAGER DEFINITIONS ========= -->
-
-	<bean id="aclCache" class="org.springframework.security.acls.jdbc.EhCacheBasedAclCache">
-		<constructor-arg>
-		   <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-		      <property name="cacheManager">
-				<bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>
-		      </property>
-		      <property name="cacheName">
-		         <value>aclCache</value>
-		      </property>
-		   </bean>
-		</constructor-arg>
-	</bean>
-    
-	<bean id="aclAuthorizationStrategy" class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
-		<constructor-arg>
-			<list>
-				<bean class="org.springframework.security.GrantedAuthorityImpl">
-					<constructor-arg value="ROLE_ADMINISTRATOR"/>
-				</bean>
-				<bean class="org.springframework.security.GrantedAuthorityImpl">
-					<constructor-arg value="ROLE_ADMINISTRATOR"/>
-				</bean>
-				<bean class="org.springframework.security.GrantedAuthorityImpl">
-					<constructor-arg value="ROLE_ADMINISTRATOR"/>
-				</bean>
-			</list>
-		</constructor-arg>
-	</bean>
-		
-	<bean id="aclManager" class="com.forgon.security.service.AclManagerImpl">
-	    <property name="mutableAclService" ref="aclService"/>
-	    <property name="directoryHelper" ref="directoryHelper"/>
-	    <property name="objectDao" ref="objectDao"/>
-	</bean>
-
-   <!-- ============== "AFTER INTERCEPTION" AUTHORIZATION DEFINITIONS =========== -->
-
-   <bean id="afterInvocationManager" class="org.springframework.security.afterinvocation.AfterInvocationProviderManager">
-      <property name="providers">
-         <list>
-            <ref local="afterAclRead"/>
-            <ref local="afterAclCollectionRead"/>
-            <ref local="afterTreeNodeAclCollectionRead"/>
-         </list>
-      </property>
-   </bean>
-   
-   <!-- Processes AFTER_ACL_COLLECTION_READ configuration settings -->
-   <bean id="afterAclCollectionRead" class="org.springframework.security.afterinvocation.AclEntryAfterInvocationCollectionFilteringProvider">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.READ"/>
-      	</list>
-      </constructor-arg>
-      <property name="processDomainObjectClass"><value>com.forgon.oa.po.publicinformation.PublicInformation</value></property>
-   </bean>
-
-   <bean id="afterTreeNodeAclCollectionRead" class="org.springframework.security.afterinvocation.AclEntryAfterInvocationCollectionFilteringProvider">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.READ"/>
-      	</list>
-      </constructor-arg>
-      <!-- <property name="processDomainObjectClass"><value>com.forgon.knowledge.model.KnowledgeFolder</value></property> -->
-   </bean>
-      
-   <!-- Processes AFTER_ACL_READ configuration settings -->
-   <bean id="afterAclRead" class="org.springframework.security.afterinvocation.AclEntryAfterInvocationProvider">
-      <constructor-arg>
-      	<ref bean="aclService"/>
-      </constructor-arg>
-      <constructor-arg>
-      	<list>
-          <ref local="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
-          <ref local="org.springframework.security.acls.domain.BasePermission.READ"/>
-      	</list>
-      </constructor-arg>
-   </bean>
-
-   <!-- ================= METHOD INVOCATION AUTHORIZATION ==================== -->
-
-   <!-- getRandomPublicInformation() is public.
-
-    The create, getAll, getById etc have ROLE_USER to ensure user is
-    authenticated (all users hold ROLE_USER in this application).
-
-    The delete and update methods don't need a ROLE_USER as they will
-    ensure the user is authenticated via their ACL_PUBLICINFORMATION_DELETE or
-    ACL_PUBLICINFORMATION_READ attribute, which also ensures the user has permission
-    to the PublicInformation presented as a method argument.
-    -->
-   <bean id="treeNodeObjectSecurity" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
-      <property name="authenticationManager"><ref bean="authenticationManager"/></property>
-      <property name="accessDecisionManager"><ref local="businessAccessDecisionManager"/></property>
-      <property name="afterInvocationManager"><ref local="afterInvocationManager"/></property>
-      <property name="objectDefinitionSource">
-         <value>
-            com.forgon.treenode.model.TreeNodeObject.getChildren=ROLE_USER,AFTER_ACL_COLLECTION_READ
-         </value>
-      </property>
-   </bean>
-
-   <bean id="publicInformationManagerSecurity" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
-      <property name="authenticationManager"><ref bean="authenticationManager"/></property>
-      <property name="accessDecisionManager"><ref local="businessAccessDecisionManager"/></property>
-      <property name="afterInvocationManager"><ref local="afterInvocationManager"/></property>
-      <property name="objectDefinitionSource">
-         <value>
-         </value>
-      </property>
-   </bean>
-
-   <bean id="workflowUtilSecurity" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
-      <property name="authenticationManager"><ref bean="authenticationManager"/></property>
-      <property name="accessDecisionManager"><ref local="businessAccessDecisionManager"/></property>
-      <property name="afterInvocationManager"><ref local="afterInvocationManager"/></property>
-      <property name="objectDefinitionSource">
-         <value>
-            com.forgon.workflow.util.WorkflowUtilInterface.deleteWorkflowForm=ACL_WORKFLOWFORM_DELETE
-         </value>
-      </property>
-   </bean>
+ 
 </beans>