Index: ../../poulpe/poulpe-service/src/main/resources/org/jtalks/poulpe/service/applicationContext-service-security.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!--\n\n    Copyright (C) 2011  JTalks.org Team\n    This library is free software; you can redistribute it and/or\n    modify it under the terms of the GNU Lesser General Public\n    License as published by the Free Software Foundation; either\n    version 2.1 of the License, or (at your option) any later version.\n    This library is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n    Lesser General Public License for more details.\n    You should have received a copy of the GNU Lesser General Public\n    License along with this library; if not, write to the Free Software\n    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\n-->\n<beans xmlns=\"http://www.springframework.org/schema/beans\"\n       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n       xsi:schemaLocation=\"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd\">\n\n  <!-- Retrieves, modifies and strores access control lists -->\n  <bean id=\"aclService\" class=\"org.springframework.security.acls.jdbc.JdbcMutableAclService\">\n    <constructor-arg ref=\"dataSource\"/>\n    <constructor-arg ref=\"lookupStrategy\"/>\n    <constructor-arg ref=\"aclCache\"/>\n    <property name=\"classIdentityQuery\" value=\"SELECT @@IDENTITY\"/>\n    <property name=\"sidIdentityQuery\" value=\"SELECT @@IDENTITY\"/>\n    <property name=\"sidFactory\" ref=\"jtalksSidFactory\"/>\n  </bean>\n  <bean id=\"dtoMapper\" class=\"org.jtalks.common.service.security.DtoMapper\"/>\n\n  <bean id=\"baseLookupStrategy\" class=\"org.springframework.security.acls.jdbc.BasicLookupStrategy\">\n    <constructor-arg ref=\"dataSource\"/>\n    <constructor-arg ref=\"aclCache\"/>\n    <constructor-arg ref=\"jtalksAclAuthorizationStrategy\"/>\n    <constructor-arg>\n      <bean class=\"org.springframework.security.acls.domain.ConsoleAuditLogger\"/>\n    </constructor-arg>\n    <property name=\"permissionFactory\" ref=\"permissionFactory\"/>\n  </bean>\n\n  <bean id=\"jtalksSidFactory\" class=\"org.jtalks.common.security.acl.sids.JtalksSidFactory\"/>\n  <!-- ACL permission factory -->\n  <bean id=\"permissionFactory\" class=\"org.springframework.security.acls.domain.DefaultPermissionFactory\"/>\n  <!-- Responsible for efficient retrieval of ACLs from database -->\n  <!-- Responsible for efficient retrieval of ACLs from database -->\n  <bean id=\"lookupStrategy\" class=\"org.springframework.security.acls.jdbc.BasicLookupStrategy\">\n    <constructor-arg ref=\"dataSource\"/>\n    <constructor-arg ref=\"aclCache\"/>\n    <constructor-arg ref=\"jtalksAclAuthorizationStrategy\"/>\n    <constructor-arg>\n      <bean class=\"org.springframework.security.acls.domain.ConsoleAuditLogger\"/>\n    </constructor-arg>\n    <property name=\"permissionFactory\">\n      <bean class=\"org.jtalks.common.security.acl.JtalksPermissionFactory\" init-method=\"init\"/>\n    </property>\n    <property name=\"sidFactory\" ref=\"jtalksSidFactory\"/>\n  </bean>\n\n  <!-- Caching support for ACLs -->\n  <bean id=\"aclCache\" class=\"org.springframework.security.acls.domain.EhCacheBasedAclCache\">\n    <constructor-arg>\n      <bean class=\"org.springframework.cache.ehcache.EhCacheFactoryBean\">\n        <property name=\"cacheManager\">\n          <bean class=\"org.springframework.cache.ehcache.EhCacheManagerFactoryBean\"/>\n        </property>\n      </bean>\n    </constructor-arg>\n  </bean>\n\n  <bean id=\"jtalksAclAuthorizationStrategy\" class=\"org.jtalks.poulpe.security.AclAuthorizationStrategyImpl\"/>\n\n  <bean id=\"aclManager\" class=\"org.jtalks.common.security.acl.AclManager\">\n    <constructor-arg ref=\"aclService\"/>\n    <property name=\"aclUtil\" ref=\"aclUtil\"/>\n  </bean>\n  <bean  name=\"aclUtil\" class=\"org.jtalks.common.security.acl.AclUtil\">\n      <constructor-arg ref=\"aclService\"/>\n      <property name=\"objectIdentityGenerator\" ref=\"typeConvertingObjectIdentityGenerator\"/>\n  </bean>\n  <bean id=\"typeConvertingObjectIdentityGenerator\" factory-method=\"createDefaultGenerator\"\n        class=\"org.jtalks.common.security.acl.TypeConvertingObjectIdentityGenerator\">\n    <property name=\"additionalConversionRules\">\n      <map>\n        <entry key=\"org.jtalks.poulpe.model.entity.Component\" value=\"COMPONENT\"/>\n      </map>\n    </property>\n  </bean>\n  <bean id=\"securityService\" class=\"org.jtalks.common.security.SecurityService\">\n    <constructor-arg index=\"0\" ref=\"userDao\"/>\n    <constructor-arg index=\"1\" ref=\"aclManager\"/>\n  </bean>\n\n</beans>\n
===================================================================
--- ../../poulpe/poulpe-service/src/main/resources/org/jtalks/poulpe/service/applicationContext-service-security.xml	(revision 5290e84269981fdde1d42f75130da33c292ffdcb)
+++ ../../poulpe/poulpe-service/src/main/resources/org/jtalks/poulpe/service/applicationContext-service-security.xml	(revision )
@@ -19,77 +19,80 @@
        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">
 
-  <!-- Retrieves, modifies and strores access control lists -->
-  <bean id="aclService" class="org.springframework.security.acls.jdbc.JdbcMutableAclService">
-    <constructor-arg ref="dataSource"/>
-    <constructor-arg ref="lookupStrategy"/>
-    <constructor-arg ref="aclCache"/>
-    <property name="classIdentityQuery" value="SELECT @@IDENTITY"/>
-    <property name="sidIdentityQuery" value="SELECT @@IDENTITY"/>
-    <property name="sidFactory" ref="jtalksSidFactory"/>
-  </bean>
-  <bean id="dtoMapper" class="org.jtalks.common.service.security.DtoMapper"/>
+    <!-- Retrieves, modifies and strores access control lists -->
+    <bean id="aclService" class="org.springframework.security.acls.jdbc.JdbcMutableAclService">
+        <constructor-arg ref="dataSource"/>
+        <constructor-arg ref="lookupStrategy"/>
+        <constructor-arg ref="aclCache"/>
+        <property name="classIdentityQuery" value="SELECT @@IDENTITY"/>
+        <property name="sidIdentityQuery" value="SELECT @@IDENTITY"/>
+        <property name="sidFactory" ref="jtalksSidFactory"/>
+    </bean>
+    <bean id="dtoMapper" class="org.jtalks.common.service.security.DtoMapper"/>
 
-  <bean id="baseLookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
-    <constructor-arg ref="dataSource"/>
-    <constructor-arg ref="aclCache"/>
-    <constructor-arg ref="jtalksAclAuthorizationStrategy"/>
-    <constructor-arg>
-      <bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
-    </constructor-arg>
-    <property name="permissionFactory" ref="permissionFactory"/>
-  </bean>
+    <bean id="baseLookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
+        <constructor-arg ref="dataSource"/>
+        <constructor-arg ref="aclCache"/>
+        <constructor-arg ref="jtalksAclAuthorizationStrategy"/>
+        <constructor-arg>
+            <bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
+        </constructor-arg>
+        <property name="permissionFactory" ref="permissionFactory"/>
+    </bean>
 
-  <bean id="jtalksSidFactory" class="org.jtalks.common.security.acl.sids.JtalksSidFactory"/>
-  <!-- ACL permission factory -->
-  <bean id="permissionFactory" class="org.springframework.security.acls.domain.DefaultPermissionFactory"/>
-  <!-- Responsible for efficient retrieval of ACLs from database -->
-  <!-- Responsible for efficient retrieval of ACLs from database -->
-  <bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
-    <constructor-arg ref="dataSource"/>
-    <constructor-arg ref="aclCache"/>
-    <constructor-arg ref="jtalksAclAuthorizationStrategy"/>
-    <constructor-arg>
-      <bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
-    </constructor-arg>
-    <property name="permissionFactory">
-      <bean class="org.jtalks.common.security.acl.JtalksPermissionFactory" init-method="init"/>
-    </property>
-    <property name="sidFactory" ref="jtalksSidFactory"/>
-  </bean>
+    <bean id="jtalksSidFactory" class="org.jtalks.common.security.acl.sids.JtalksSidFactory"/>
+    <!-- ACL permission factory -->
+    <bean id="permissionFactory" class="org.springframework.security.acls.domain.DefaultPermissionFactory"/>
+    <!-- Responsible for efficient retrieval of ACLs from database -->
+    <!-- Responsible for efficient retrieval of ACLs from database -->
+    <bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
+        <constructor-arg ref="dataSource"/>
+        <constructor-arg ref="aclCache"/>
+        <constructor-arg ref="jtalksAclAuthorizationStrategy"/>
+        <constructor-arg>
+            <bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
+        </constructor-arg>
+        <property name="permissionFactory">
+            <bean class="org.jtalks.common.security.acl.JtalksPermissionFactory" init-method="init"/>
+        </property>
+        <property name="sidFactory" ref="jtalksSidFactory"/>
+    </bean>
 
-  <!-- Caching support for ACLs -->
-  <bean id="aclCache" class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
-    <constructor-arg>
-      <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+    <!-- Caching support for ACLs -->
+    <bean id="aclCache" class="org.springframework.security.acls.domain.EhCacheBasedAclCache">
+        <constructor-arg>
+            <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-        <property name="cacheManager">
-          <bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>
-        </property>
+                <property name="cacheManager" ref="replicatingCache"/>
+                <property name="cacheName" value="org.jtalks.EHCOMMON"/>
-      </bean>
-    </constructor-arg>
+            </bean>
+        </constructor-arg>
+    </bean>
+
+    <bean id="replicatingCache" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+        <property name="configLocation" value="classpath:/org/jtalks/poulpe/model/entity/ehcache.xml"/>
-  </bean>
-
-  <bean id="jtalksAclAuthorizationStrategy" class="org.jtalks.poulpe.security.AclAuthorizationStrategyImpl"/>
+    </bean>
+    
+    <bean id="jtalksAclAuthorizationStrategy" class="org.jtalks.poulpe.security.AclAuthorizationStrategyImpl"/>
 
-  <bean id="aclManager" class="org.jtalks.common.security.acl.AclManager">
-    <constructor-arg ref="aclService"/>
-    <property name="aclUtil" ref="aclUtil"/>
-  </bean>
+    <bean id="aclManager" class="org.jtalks.common.security.acl.AclManager">
+        <constructor-arg ref="aclService"/>
+        <property name="aclUtil" ref="aclUtil"/>
+    </bean>
-  <bean  name="aclUtil" class="org.jtalks.common.security.acl.AclUtil">
+    <bean name="aclUtil" class="org.jtalks.common.security.acl.AclUtil">
-      <constructor-arg ref="aclService"/>
-      <property name="objectIdentityGenerator" ref="typeConvertingObjectIdentityGenerator"/>
-  </bean>
-  <bean id="typeConvertingObjectIdentityGenerator" factory-method="createDefaultGenerator"
-        class="org.jtalks.common.security.acl.TypeConvertingObjectIdentityGenerator">
-    <property name="additionalConversionRules">
-      <map>
-        <entry key="org.jtalks.poulpe.model.entity.Component" value="COMPONENT"/>
-      </map>
-    </property>
-  </bean>
-  <bean id="securityService" class="org.jtalks.common.security.SecurityService">
-    <constructor-arg index="0" ref="userDao"/>
-    <constructor-arg index="1" ref="aclManager"/>
-  </bean>
+        <constructor-arg ref="aclService"/>
+        <property name="objectIdentityGenerator" ref="typeConvertingObjectIdentityGenerator"/>
+    </bean>
+    <bean id="typeConvertingObjectIdentityGenerator" factory-method="createDefaultGenerator"
+          class="org.jtalks.common.security.acl.TypeConvertingObjectIdentityGenerator">
+        <property name="additionalConversionRules">
+            <map>
+                <entry key="org.jtalks.poulpe.model.entity.Component" value="COMPONENT"/>
+            </map>
+        </property>
+    </bean>
+    <bean id="securityService" class="org.jtalks.common.security.SecurityService">
+        <constructor-arg index="0" ref="userDao"/>
+        <constructor-arg index="1" ref="aclManager"/>
+    </bean>
 
 </beans>