Merged V2.2 to HEAD

7260: Basic JMX sys admin - to manage session/tickets and server modes such as read-only and single-user


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/authentication-services-context.xml

@@ -126,6 +126,9 @@
         </property>
         <property name="authenticationComponent">
             <ref bean="authenticationComponent" />
+        </property>
+        <property name="sysAdminCache">
+            <ref bean="sysAdminCache"/>
         </property>
     </bean>
 

config/alfresco/cache-context.xml

@@ -243,6 +243,39 @@
       <property name="maxCacheSize">
          <value>10</value>
       </property>
+   </bean>
+   
+   
+   <!-- ===================================== -->
+   <!-- SysAdmin (JMX Config) Cache           -->
+   <!-- ===================================== -->
+   
+   <bean name="sysAdminSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.sysAdminCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <bean name="sysAdminCache" class="org.alfresco.repo.cache.TransactionalCache">
+      <property name="sharedCache">
+         <ref bean="sysAdminSharedCache" />
+      </property>
+      <property name="cacheManager" >
+         <ref bean="transactionalEHCacheManager" />
+      </property>
+      <property name="name">
+         <value>org.alfresco.sysAdminTransactionalCache</value>
+      </property>
+      <property name="maxCacheSize">
+         <value>10</value>
+      </property>
    </bean>
    
    <!-- ===================================== -->

config/alfresco/core-services-context.xml

@@ -84,6 +84,7 @@
            <entry key="Alfresco:Name=VirtServerRegistry,Type=VirtServerRegistry" value-ref="VirtServerRegistry"/>
            <entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/>
            <entry key="Alfresco:Name=Log4jHierarchy,Type=Log4JHierarchy" value-ref="log4jHierarchy"/>
+           <entry key="Alfresco:Name=RepoServerMgmt,Type=RepoServerMgmt" value-ref="RepoServerMgmt"/>
          </map>
        </property>
     </bean>
@@ -128,7 +129,14 @@
     
     <bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
     	<property name="log4jHierarchy" ref="log4jHierarchy"/>
-    </bean>
+    </bean>
+    
+    
+    <bean id="RepoServerMgmt" class="org.alfresco.repo.admin.RepoServerMgmt">       
+        <property name="transactionService"><ref bean="transactionService"/></property>
+        <property name="authenticationService"><ref bean="authenticationService"/></property>
+    </bean>
+    
 
     <!-- Datasource bean -->
     <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
@@ -175,6 +183,9 @@
     <bean id="transactionService" class="org.alfresco.repo.transaction.TransactionServiceImpl">
         <property name="transactionManager">
             <ref bean="transactionManager" />
+        </property>
+        <property name="sysAdminCache">
+            <ref bean="sysAdminCache"/>
         </property>
         <property name="allowWrite">
             <value>${server.transaction.allow-writes}</value>

config/alfresco/ehcache-default.xml

@@ -310,6 +310,12 @@
         maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="true"
+        />
+    <cache
+        name="org.alfresco.cache.sysAdminCache"
+        maxElementsInMemory="10"
+        eternal="true"
+        overflowToDisk="false"
         />
         
         

config/alfresco/extension/ehcache-custom.xml.sample.cluster

@@ -509,8 +509,24 @@
                                 replicateUpdatesViaCopy = true,
                                 replicateAsynchronously = false"/>
     </cache>
+    
+    <!-- note: updates via copy rather than invalidation -->
+    <cache
+        name="org.alfresco.cache.sysAdminCache"
+        maxElementsInMemory="10"
+        eternal="true"
+        overflowToDisk="false">
+
+            <cacheEventListenerFactory
+                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                    properties="replicatePuts = false,
+                                replicateUpdates = true,
+                                replicateRemovals = true,
+                                replicateUpdatesViaCopy = true,
+                                replicateAsynchronously = false"/>
+    </cache>
+
 
-        
     <!-- Web Client Config (tenant-based) -->
         
     <cache