Merged V4.1-BUG-FIX to HEAD

42902: Merged DEV to V4.1-BUG-FIX
      42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account 
         Add ability to unregister class behaviours.
         Unregister googledocs behaviours when subsystem stops.
   42903: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42901: Merged DEV to V3.4-BUG-FIX
         42837: ALF-12833: Issues installing Alfresco on WebSphere when the server doesn't have internet access
            Create servlet-resources.jar(the same as servlet.jar but only with "resources") and add it into alfresco.war


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-10-21 18:11:58 +00:00
parent b58125d078
commit 8640f47cb1
6 changed files with 82 additions and 16 deletions

View File

@@ -213,4 +213,22 @@ import org.alfresco.service.namespace.QName;
}
}
/**
* Remove class behaviour
*
* @param behaviour
*/
public void removeClassBehaviour(BehaviourDefinition<B> behaviour)
{
lock.writeLock().lock();
try
{
classMap.remove(behaviour);
}
finally
{
lock.writeLock().unlock();
}
}
}