[Yanel-commits] rev 20276 - in public/yanel/trunk: conf src/core/java/org/wyona/yanel/cmdl src/core/java/org/wyona/yanel/servlet

[josias at wyona.com]

Author: josias
Date: 2006-11-23 19:07:40 +0100 (Thu, 23 Nov 2006)
New Revision: 20276

Modified:
   public/yanel/trunk/conf/spring-yanel-config.xml
   public/yanel/trunk/src/core/java/org/wyona/yanel/cmdl/YanelCommandLine.java
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
Get IdentityManager and PolicyManager through the Spring Fw. Fixes bug #5059

Modified: public/yanel/trunk/conf/spring-yanel-config.xml
===================================================================
--- public/yanel/trunk/conf/spring-yanel-config.xml	2006-11-23 18:06:23 UTC (rev 20275)
+++ public/yanel/trunk/conf/spring-yanel-config.xml	2006-11-23 18:07:40 UTC (rev 20276)
@@ -7,4 +7,6 @@
     <!-- <property name="someProperty"><value>someValue</value></property> -->
   </bean>
   <bean id="map" class="org.wyona.yanel.impl.map.MapImpl"/>
+  <bean id="policyManager" class="org.wyona.security.impl.PolicyManagerImpl"/>
+  <bean id="identityManager" class="org.wyona.security.impl.IdentityManagerImpl"/>
 </beans>

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/cmdl/YanelCommandLine.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/cmdl/YanelCommandLine.java	2006-11-23 18:06:23 UTC (rev 20275)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/cmdl/YanelCommandLine.java	2006-11-23 18:07:40 UTC (rev 20276)
@@ -31,7 +31,6 @@
 
 import org.wyona.yanel.util.ResourceAttributeHelper;
 
-import org.wyona.security.core.PolicyManagerFactory;
 import org.wyona.security.core.api.Identity;
 import org.wyona.security.core.api.PolicyManager;
 import org.wyona.security.core.api.Role;
@@ -87,8 +86,9 @@
             }
         }
 
-        PolicyManagerFactory pmf = PolicyManagerFactory.newInstance();
-        PolicyManager pm = pmf.newPolicyManager();
+      
+        PolicyManager pm = (PolicyManager) yanel.getBeanFactory().getBean("policyManager");
+    
 
         String[] groupnames = {"admin", "accounting"};
         if (pm.authorize(new org.wyona.commons.io.Path(path.toString()), new Identity("lenya", groupnames), new Role("view"))) {

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2006-11-23 18:06:23 UTC (rev 20275)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2006-11-23 18:07:40 UTC (rev 20276)
@@ -31,8 +31,6 @@
 import org.wyona.yanel.servlet.CreateUsecaseHelper;
 import org.wyona.yanel.util.ResourceAttributeHelper;
 
-import org.wyona.security.core.IdentityManagerFactory;
-import org.wyona.security.core.PolicyManagerFactory;
 import org.wyona.security.core.api.Identity;
 import org.wyona.security.core.api.IdentityManager;
 import org.wyona.security.core.api.PolicyManager;
@@ -83,12 +81,9 @@
             
             rtr = new ResourceTypeRegistry();
 
-            PolicyManagerFactory pmf = PolicyManagerFactory.newInstance();
-            pm = pmf.newPolicyManager();
+            pm = (PolicyManager) yanel.getBeanFactory().getBean("policyManager");
 
-            IdentityManagerFactory imf = IdentityManagerFactory.newInstance();
-            im = imf.newIdentityManager();
-
+            im = (IdentityManager) yanel.getBeanFactory().getBean("identityManager");
           
             map = (Map) yanel.getBeanFactory().getBean("map");