[Beeframework-svn] SF.net SVN: beeframework:[283] trunk/framework

[<m_p...@us...>]

Revision: 283
          http://sourceforge.net/p/beeframework/code/283
Author:   m_plomer
Date:     2015-02-16 08:43:54 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
- Security/Acl: fixed regressions from namespace refactoring
- Security/Vote: namespace refactoring

Modified Paths:
--------------
    trunk/framework/Bee/Security/Config/Utils.php
    trunk/framework/Bee/Security/Vote/AclEntryVoter.php
    trunk/framework/acl-default.xml

Modified: trunk/framework/Bee/Security/Config/Utils.php
===================================================================
--- trunk/framework/Bee/Security/Config/Utils.php	2015-02-16 08:02:59 UTC (rev 282)
+++ trunk/framework/Bee/Security/Config/Utils.php	2015-02-16 08:43:54 UTC (rev 283)
@@ -34,7 +34,7 @@
             $roleVoter->setBeanClassName('Bee\Security\Vote\RoleVoter');
 
 //            $authenticatedVoter = new GenericBeanDefinition();
-//            $authenticatedVoter->setBeanClassName('Bee_Security_Vote_AuthenticatedVoter'); // todo: implement...
+//            $authenticatedVoter->setBeanClassName('Bee\Security\Vote\AuthenticatedVoter'); // todo: implement...
 
             $defaultVoters = array(
                 $roleVoter/*,

Modified: trunk/framework/Bee/Security/Vote/AclEntryVoter.php
===================================================================
--- trunk/framework/Bee/Security/Vote/AclEntryVoter.php	2015-02-16 08:02:59 UTC (rev 282)
+++ trunk/framework/Bee/Security/Vote/AclEntryVoter.php	2015-02-16 08:43:54 UTC (rev 283)
@@ -38,7 +38,7 @@
  * To change this template use File | Settings | File Templates.
  */
 
-class Bee_Security_Vote_AclEntryVoter extends AbstractAclVoter {
+class AclEntryVoter extends AbstractAclVoter {
 
 	/**
 	 * @var Logger

Modified: trunk/framework/acl-default.xml
===================================================================
--- trunk/framework/acl-default.xml	2015-02-16 08:02:59 UTC (rev 282)
+++ trunk/framework/acl-default.xml	2015-02-16 08:43:54 UTC (rev 283)
@@ -67,7 +67,7 @@
         <constructor-arg index="0" ref="defaultAclService" />
     </bean>
 
-    <bean id="aclVoterRead" class="Bee_Security_Vote_AclEntryVoter" parent="aclVoterTemplate">
+    <bean id="aclVoterRead" class="Bee\Security\Vote\AclEntryVoter" parent="aclVoterTemplate">
         <constructor-arg index="1" value="ACL_OBJECT_READ" />
         <constructor-arg index="2">
             <array>
@@ -76,7 +76,7 @@
         </constructor-arg>
 	</bean>
 
-    <bean id="aclVoterWrite" class="Bee_Security_Vote_AclEntryVoter" parent="aclVoterTemplate">
+    <bean id="aclVoterWrite" class="Bee\Security\Vote\AclEntryVoter" parent="aclVoterTemplate">
         <constructor-arg index="1" value="ACL_OBJECT_WRITE" />
         <constructor-arg index="2">
             <array>
@@ -85,7 +85,7 @@
         </constructor-arg>
 	</bean>
 
-    <bean id="aclVoterCreate" class="Bee_Security_Vote_AclEntryVoter" parent="aclVoterTemplate">
+    <bean id="aclVoterCreate" class="Bee\Security\Vote\AclEntryVoter" parent="aclVoterTemplate">
         <constructor-arg index="1" value="ACL_OBJECT_CREATE" />
         <constructor-arg index="2">
             <array>
@@ -94,7 +94,7 @@
         </constructor-arg>
 	</bean>
 
-    <bean id="aclVoterDelete" class="Bee_Security_Vote_AclEntryVoter" parent="aclVoterTemplate">
+    <bean id="aclVoterDelete" class="Bee\Security\Vote\AclEntryVoter" parent="aclVoterTemplate">
         <constructor-arg index="1" value="ACL_OBJECT_DELETE" />
         <constructor-arg index="2">
             <array>
@@ -103,7 +103,7 @@
         </constructor-arg>
 	</bean>
 
-    <bean id="aclVoterModify" class="Bee_Security_Vote_AclEntryVoter" parent="aclVoterTemplate">
+    <bean id="aclVoterModify" class="Bee\Security\Vote\AclEntryVoter" parent="aclVoterTemplate">
         <constructor-arg index="1" value="ACL_OBJECT_MODIFY" />
         <constructor-arg index="2">
             <array>
@@ -114,7 +114,7 @@
         </constructor-arg>
 	</bean>
 
-    <bean id="aclVoterAdministration" class="Bee_Security_Vote_AclEntryVoter" parent="aclVoterTemplate">
+    <bean id="aclVoterAdministration" class="Bee\Security\Vote\AclEntryVoter" parent="aclVoterTemplate">
         <constructor-arg index="1" value="ACL_OBJECT_ADMINISTRATION" />
         <constructor-arg index="2">
             <array>
@@ -126,7 +126,7 @@
     <bean id="accessDecisionManager" class="Bee\Security\Vote\AffirmativeBased">
 		<property name="decisionVoters">
 			<array>
-				<bean class="Bee\Security\Vote\RoleVoter"/>
+				<bean class="BeeSecurity\Vote\RoleVoter"/>
 				<ref bean="aclVoterRead" />
 				<ref bean="aclVoterWrite" />
 				<ref bean="aclVoterCreate" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.