svn commit: r1678139 [3/3] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/ components/jetspeed-profiler/src/test/resources/ components/jetspeed-security/src/main/java/org/apache/jetspeed/secur...

[email protected]
Newsgroups gmane.comp.jakarta.jetspeed.devel
Message-ID <[email protected]> 
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml?rev=1678139&r1=1678138&r2=1678139&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml Thu May  7 06:48:06 2015
@@ -330,4 +330,97 @@
         </constructor-arg>
     </bean>
 
+    <!-- Jetspeed Security Persistence Manager Caches -->
+    <bean id="ehJSPMPrincipalCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmPrincipalCache"/>
+    </bean>
+
+    <bean id="ehJSPMPermissionCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmPermissionCache"/>
+    </bean>
+
+    <bean id="ehJSPMDomainCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmDomainCache"/>
+    </bean>
+
+    <bean id="ehJSPMPrincipalQueryCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmPrincipalQueryCache"/>
+    </bean>
+
+    <bean id="ehJSPMAssociationQueryCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmAssociationQueryCache"/>
+    </bean>
+
+    <bean id="ehJSPMPasswordCredentialQueryCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmPasswordCredentialQueryCache"/>
+    </bean>
+
+    <bean id="ehJSPMPermissionQueryCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmPermissionQueryCache"/>
+    </bean>
+
+    <bean id="ehJSPMDomainQueryCache" parent="ehCacheParent">
+        <meta key="j2:cat" value="default or cache"/>
+        <property name="cacheName" value="jspmDomainQueryCache"/>
+    </bean>
+
+    <bean id="jspmPrincipalCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMPrincipalCache"/></constructor-arg>
+    </bean>
+
+    <bean id="jspmPermissionCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMPermissionCache"/></constructor-arg>
+    </bean>
+
+    <bean id="jspmDomainCache" class="org.apache.jetspeed.cache.impl.EhCacheDistributedImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMDomainCache"/></constructor-arg>
+    </bean>
+
+    <bean id="jspmPrincipalQueryCache" class="org.apache.jetspeed.security.spi.impl.cache.JSPMQueryEhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMPrincipalQueryCache"/></constructor-arg>
+    </bean>
+    
+    <bean id="jspmAssociationQueryCache" class="org.apache.jetspeed.security.spi.impl.cache.JSPMQueryEhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMAssociationQueryCache"/></constructor-arg>
+    </bean>
+
+    <bean id="jspmPasswordCredentialQueryCache" class="org.apache.jetspeed.security.spi.impl.cache.JSPMQueryEhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMPasswordCredentialQueryCache"/></constructor-arg>
+    </bean>
+
+    <bean id="jspmPermissionQueryCache" class="org.apache.jetspeed.security.spi.impl.cache.JSPMQueryEhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMPermissionQueryCache"/></constructor-arg>
+    </bean>
+
+    <bean id="jspmDomainQueryCache" class="org.apache.jetspeed.security.spi.impl.cache.JSPMQueryEhCacheImpl">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="ehJSPMDomainQueryCache"/></constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.security.spi.impl.cache.JSPMCache" class="org.apache.jetspeed.security.spi.impl.cache.JSPMCacheImpl"
+          init-method="initialize" destroy-method="terminate">
+        <meta key="j2:cat" value="default or cache"/>
+        <constructor-arg><ref bean="jspmPrincipalCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmPermissionCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmDomainCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmPrincipalQueryCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmAssociationQueryCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmPasswordCredentialQueryCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmPermissionQueryCache"/></constructor-arg>
+        <constructor-arg><ref bean="jspmDomainQueryCache"/></constructor-arg>
+    </bean>
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml?rev=1678139&r1=1678138&r2=1678139&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml Thu May  7 06:48:06 2015
@@ -43,6 +43,9 @@
     <constructor-arg index="1">
       <ref bean="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLookupManagerFactory"/>
     </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="org.apache.jetspeed.security.spi.impl.cache.JSPMCache"/>
+    </constructor-arg>
   </bean>
   
   <bean id="org.apache.jetspeed.security.spi.JetspeedSecurityPersistenceManager" parent="baseTransactionProxy">

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=1678139&r1=1678138&r2=1678139&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties Thu May  7 06:48:06 2015
@@ -327,6 +327,14 @@ page.file.cache.size=100
 #org.apache.jetspeed.ehcache.pagemanager.maxfiles=1000
 
 #-------------------------------------------------------------------------
+# S E C U R I T Y   P E R S I S T E N C E   C A C H E
+#-------------------------------------------------------------------------
+# jetspeed security persistence manager cache size:
+#org.apache.jetspeed.ehcache.jspm.maxelements=128
+# jetspeed security persistence manager cache element expiration in seconds, (infinite = 0):
+#org.apache.jetspeed.ehcache.jspm.element.ttl=150
+
+#-------------------------------------------------------------------------
 # C A C H E
 #-------------------------------------------------------------------------
 # cache configuration resource, ('ehcache.xml' or 'distributed-ehcache.xml' supported by default):
@@ -411,4 +419,3 @@ jetui.style.layout = .portal-layout-colu
 jetui.style.drag.handle = .PTitle
 # redirect to home space on login
 jetui.redirect.home.space=true
-

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml?rev=1678139&r1=1678138&r2=1678139&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/distributed-ehcache.xml Thu May  7 06:48:06 2015
@@ -607,4 +607,93 @@
                                                replicateRemovals=true"/>
     </cache>
 
+    <!--
+        Jetspeed Security Persistence Manager Caches
+    -->
+
+    <cache name="jspmPrincipalCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU">
+        <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                                   properties="replicateAsynchronously=true,
+                                               replicatePuts=false,
+                                               replicateUpdates=false,
+                                               replicateUpdatesViaCopy=false,
+                                               replicateRemovals=true"/>
+    </cache>
+
+    <cache name="jspmPermissionCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU">
+        <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                                   properties="replicateAsynchronously=true,
+                                               replicatePuts=false,
+                                               replicateUpdates=false,
+                                               replicateUpdatesViaCopy=false,
+                                               replicateRemovals=true"/>
+    </cache>
+
+    <cache name="jspmDomainCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU">
+        <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                                   properties="replicateAsynchronously=true,
+                                               replicatePuts=false,
+                                               replicateUpdates=false,
+                                               replicateUpdatesViaCopy=false,
+                                               replicateRemovals=true"/>
+    </cache>
+
+    <cache name="jspmPrincipalQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmAssociationQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmPasswordCredentialQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmPermissionQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmDomainQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
 </ehcache>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml?rev=1678139&r1=1678138&r2=1678139&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/ehcache.xml Thu May  7 06:48:06 2015
@@ -557,4 +557,72 @@
            timeToLiveSeconds="${org.apache.jetspeed.ehcache.pagemanager.element.ttl}"
            memoryStoreEvictionPolicy="LRU"/>
 
+    <!--
+        Jetspeed Security Persistence Manager Caches
+    -->
+
+    <cache name="jspmPrincipalCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmPermissionCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmDomainCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmPrincipalQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmAssociationQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmPasswordCredentialQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmPermissionQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
+    <cache name="jspmDomainQueryCache"
+           maxElementsInMemory="${org.apache.jetspeed.ehcache.jspm.maxelements}"
+           eternal="false"
+           overflowToDisk="false"
+           timeToIdleSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           timeToLiveSeconds="${org.apache.jetspeed.ehcache.jspm.element.ttl}"
+           memoryStoreEvictionPolicy="LRU"/>
+
 </ehcache>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.