mirror of
				https://github.com/Alfresco/alfresco-community-repo.git
				synced 2025-10-29 15:21:53 +00:00 
			
		
		
		
	34397: ALF-13064: Updated document lib WebScript to protect against access errors dealing with permissions of locked documents
   34406: ALF-13069: Fix flash upload file selection page title corruption
   34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
   34439: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
      34438: Fix to issue where new Hazelcast based Share clustering was broken by a recent SpringSurf change to ServletRequestContextFactory bean config in libs rev 1028 or higher.
   34443: ALF-11433: IE8 specific fix to ensure that document-picker panel is hidden before documents selected event is fired and for TinyMCE to set focus on editor so that content is added correctly
   34457: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34354: ALF-12995 - IMAP: File is modified when received as a message in IMAP account
      34444: ALF-12169: Guest/guest/gUest username is now normalized to corresponding person's user ID during authentication, solving problems with synchronization with Active Directory's Guest account
      34454: Java 1.6.0_31 for 3.4.9 and 4.0.2
   34458: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      34392: ALF-13146: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
            - From Pavel: "Some users from ldap don't have lastName. That is why NPE occurs."
   34459: Merged V4.0 to V4.0-BUG-FIX
      34391: Merged DEV to V4.0 (with corrections)
         34390: ALF-13013 : It's impossible to change Activities Feed properties on Websphere
            Now the Schedule subtree in JMX is set to the correct MBeanServer.
      34407: Merged HEAD-2011_12_06 to V4.0 (4.0.1)
         Updated copyrights 
         32813: ALF-4098: WCM: Assets in in-flight worflow are allowed to be edited.
         Ability of editing assets submitted to 'in-flight' workflow has been removed:
         - .AVMSyncService. service interface was expanded with new method .List<AVMDifference> compare(int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder, boolean expandDirs). to introduce ability of collecting all created/modified items in created/modified folder;
         - all .AVMSyncService. implementations were expanded in accordance with changes in interface;
         - new tests for newly created items, items in modified folder and for deleted items in modified folder were added
      34414: ALF-11607: Bootstrap fails against database 'DB2/LINUXX8664'
      - Patched hibernate jar to recognize DB2 64 bit Linux
      34416: ALF-12992: Updated weblogic DD for SOLR
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
		
	
		
			
				
	
	
		
			108 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Java
		
	
	
	
	
	
			
		
		
	
	
			108 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Java
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2005-2010 Alfresco Software, Ltd.  All rights reserved.
 | |
|  *
 | |
|  * License rights for this program may be obtained from Alfresco Software, Ltd. 
 | |
|  * pursuant to a written agreement and any use of this program without such an 
 | |
|  * agreement is prohibited. 
 | |
|  */
 | |
| package org.alfresco.repo.management;
 | |
| 
 | |
| import javax.management.InstanceAlreadyExistsException;
 | |
| import javax.management.JMException;
 | |
| import javax.management.MBeanServer;
 | |
| import javax.management.ObjectName;
 | |
| 
 | |
| import org.springframework.jmx.export.MBeanExporter;
 | |
| import org.springframework.jmx.support.MBeanRegistrationSupport;
 | |
| 
 | |
| /**
 | |
|  * An {@link MBeanExporter} that allows individual MBeans to be registered and unregistered over time.
 | |
|  */
 | |
| public class DynamicMBeanExporter extends MBeanExporter implements DynamicMBeanExportOperations
 | |
| {
 | |
|     static private ThreadLocal<MBeanServer> threadServer = new ThreadLocal<MBeanServer>(); 
 | |
| 
 | |
|     /**
 | |
|      * Instantiates a new dynamic MBean exporter.
 | |
|      */
 | |
|     public DynamicMBeanExporter() 
 | |
|     { 
 | |
|         // For consistency, try to continue to use the last MBeanServer used in the same thread 
 | |
|         MBeanServer server = threadServer.get(); 
 | |
|         if (server != null) 
 | |
|         { 
 | |
|             setServer(server); 
 | |
|         } 
 | |
| 
 | |
|         // Make replace existing the default registration behavior 
 | |
|         setRegistrationBehavior(MBeanRegistrationSupport.REGISTRATION_REPLACE_EXISTING); 
 | |
|         setAutodetectMode(MBeanExporter.AUTODETECT_NONE); 
 | |
|     } 
 | |
| 
 | |
|     @Override
 | |
|     public void setServer(MBeanServer server) 
 | |
|     { 
 | |
|         threadServer.set(server); 
 | |
|         super.setServer(server); 
 | |
|     } 
 | |
| 	
 | |
|     /*
 | |
|      * (non-Javadoc)
 | |
|      * @see
 | |
|      * org.alfresco.enterprise.repo.management.DynamicMBeanExportOperations#unregisterMBean(javax.management.ObjectName)
 | |
|      */
 | |
|     public void unregisterMBean(ObjectName objectName)
 | |
|     {
 | |
|         if (this.registeredBeans.remove(objectName))
 | |
|         {
 | |
|             try
 | |
|             {
 | |
|                 this.server.unregisterMBean(objectName);
 | |
|                 onUnregister(objectName);
 | |
|             }
 | |
|             catch (JMException e)
 | |
|             {
 | |
|                 throw new RuntimeException(e);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     /*
 | |
|      * (non-Javadoc)
 | |
|      * @see org.alfresco.enterprise.repo.management.DynamicMBeanExportOperations#registerMBean(java.lang.Object,
 | |
|      * javax.management.ObjectName)
 | |
|      */
 | |
|     @SuppressWarnings("unchecked")
 | |
|     public ObjectName registerMBean(Object managedResource, ObjectName objectName)
 | |
|     {
 | |
|         Object mbean;
 | |
|         if (isMBean(managedResource.getClass()))
 | |
|         {
 | |
|             mbean = managedResource;
 | |
|         }
 | |
|         else
 | |
|         {
 | |
|             mbean = createAndConfigureMBean(managedResource, managedResource.getClass().getName());
 | |
|         }
 | |
|         ObjectName actualObjectName = objectName;
 | |
|         try
 | |
|         {
 | |
|             try
 | |
|             {
 | |
|                 actualObjectName = this.server.registerMBean(mbean, objectName).getObjectName();
 | |
|             }
 | |
|             catch (InstanceAlreadyExistsException ex)
 | |
|             {
 | |
|                 this.server.unregisterMBean(objectName);
 | |
|                 actualObjectName = this.server.registerMBean(mbean, objectName).getObjectName();
 | |
|             }
 | |
|         }
 | |
|         catch (JMException e)
 | |
|         {
 | |
|             throw new RuntimeException(e);
 | |
|         }
 | |
|         this.registeredBeans.add(actualObjectName);
 | |
|         onRegister(actualObjectName);
 | |
|         return actualObjectName;
 | |
|     }
 | |
| } |