forked from alkacon/opencms-core
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed problem with link handling for detail contents in HTML fields.
- Loading branch information
1 parent
0c88fa7
commit f4ea49f
Showing
12 changed files
with
690 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
247 changes: 247 additions & 0 deletions
247
src/org/opencms/ade/configuration/CmsDetailNameCache.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,247 @@ | ||
| /* | ||
| * This library is part of OpenCms - | ||
| * the Open Source Content Management System | ||
| * | ||
| * Copyright (c) Alkacon Software GmbH (http://www.alkacon.com) | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * For further information about Alkacon Software, please see the | ||
| * company website: http://www.alkacon.com | ||
| * | ||
| * For further information about OpenCms, please see the | ||
| * project website: http://www.opencms.org | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| */ | ||
|
|
||
| package org.opencms.ade.configuration; | ||
|
|
||
| import org.opencms.db.CmsPublishedResource; | ||
| import org.opencms.db.urlname.CmsUrlNameMappingEntry; | ||
| import org.opencms.db.urlname.CmsUrlNameMappingFilter; | ||
| import org.opencms.file.CmsObject; | ||
| import org.opencms.file.CmsResource; | ||
| import org.opencms.file.types.CmsResourceTypeXmlContainerPage; | ||
| import org.opencms.file.types.CmsResourceTypeXmlContent; | ||
| import org.opencms.file.types.I_CmsResourceType; | ||
| import org.opencms.loader.CmsLoaderException; | ||
| import org.opencms.main.CmsLog; | ||
| import org.opencms.main.OpenCms; | ||
| import org.opencms.util.CmsManyToOneMap; | ||
| import org.opencms.util.CmsUUID; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.apache.commons.logging.Log; | ||
|
|
||
| import com.google.common.collect.Sets; | ||
|
|
||
| /** | ||
| * A cache which stores structure ids for URL names.<p> | ||
| */ | ||
| public class CmsDetailNameCache implements I_CmsGlobalConfigurationCache { | ||
|
|
||
| /** The delay between updates. */ | ||
| public static final int DELAY_MILLIS = 10000; | ||
|
|
||
| /** The logger for this class. */ | ||
| private static final Log LOG = CmsLog.getLog(CmsDetailNameCache.class); | ||
|
|
||
| /** The CMS context used by this cache. */ | ||
| private CmsObject m_cms; | ||
|
|
||
| /** The internal map from URL names to structure ids. */ | ||
| private CmsManyToOneMap<String, CmsUUID> m_detailIdCache = new CmsManyToOneMap<String, CmsUUID>(); | ||
|
|
||
| /** The set of structure ids for which the URL names have to be updated. */ | ||
| private Set<CmsUUID> m_updateSet = Sets.newHashSet(); | ||
|
|
||
| /** | ||
| * Creates a new instance.<p> | ||
| * | ||
| * @param cms the CMS context to use | ||
| */ | ||
| public CmsDetailNameCache(CmsObject cms) { | ||
|
|
||
| m_cms = cms; | ||
| } | ||
|
|
||
| /** | ||
| * @see org.opencms.ade.configuration.I_CmsGlobalConfigurationCache#clear() | ||
| */ | ||
| public void clear() { | ||
|
|
||
| markForUpdate(CmsUUID.getNullUUID()); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Gets the structure id for a given URL name.<p> | ||
| * | ||
| * @param name the URL name | ||
| * @return the structure id for the URL name | ||
| */ | ||
| public CmsUUID getDetailId(String name) { | ||
|
|
||
| return m_detailIdCache.get(name); | ||
| } | ||
|
|
||
| /** | ||
| * Initializes the cache by scheduling the update actions and loading the initial cache contents.<p> | ||
| */ | ||
| public void initialize() { | ||
|
|
||
| OpenCms.getExecutor().scheduleWithFixedDelay(new Runnable() { | ||
|
|
||
| public void run() { | ||
|
|
||
| checkForUpdates(); | ||
| } | ||
| }, DELAY_MILLIS, DELAY_MILLIS, TimeUnit.MILLISECONDS); | ||
| reload(); | ||
| } | ||
|
|
||
| /** | ||
| * @see org.opencms.ade.configuration.I_CmsGlobalConfigurationCache#remove(org.opencms.db.CmsPublishedResource) | ||
| */ | ||
| public void remove(CmsPublishedResource pubRes) { | ||
|
|
||
| checkIfUpdateIsNeeded(pubRes.getStructureId(), pubRes.getRootPath(), pubRes.getType()); | ||
| } | ||
|
|
||
| /** | ||
| * @see org.opencms.ade.configuration.I_CmsGlobalConfigurationCache#remove(org.opencms.file.CmsResource) | ||
| */ | ||
| public void remove(CmsResource resource) { | ||
|
|
||
| checkIfUpdateIsNeeded(resource.getStructureId(), resource.getRootPath(), resource.getTypeId()); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * @see org.opencms.ade.configuration.I_CmsGlobalConfigurationCache#update(org.opencms.db.CmsPublishedResource) | ||
| */ | ||
| public void update(CmsPublishedResource pubRes) { | ||
|
|
||
| checkIfUpdateIsNeeded(pubRes.getStructureId(), pubRes.getRootPath(), pubRes.getType()); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * @see org.opencms.ade.configuration.I_CmsGlobalConfigurationCache#update(org.opencms.file.CmsResource) | ||
| */ | ||
| public void update(CmsResource resource) { | ||
|
|
||
| checkIfUpdateIsNeeded(resource.getStructureId(), resource.getRootPath(), resource.getTypeId()); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Checks if any updates are necessary and if so, performs them.<p> | ||
| */ | ||
| synchronized void checkForUpdates() { | ||
|
|
||
| if (!m_updateSet.isEmpty()) { | ||
| Set<CmsUUID> copiedIds = Sets.newHashSet(m_updateSet); | ||
| m_updateSet.clear(); | ||
|
|
||
| if (copiedIds.contains(CmsUUID.getNullUUID())) { | ||
| LOG.info("Updating detail name cache: reloading..."); | ||
| reload(); | ||
| } else { | ||
| LOG.info("Updating detail name cache. Number of changed files: " + copiedIds.size()); | ||
| CmsManyToOneMap<String, CmsUUID> cacheCopy = new CmsManyToOneMap<String, CmsUUID>(m_detailIdCache); | ||
| for (CmsUUID id : copiedIds) { | ||
| Set<String> urlNames = getUrlNames(id); | ||
| cacheCopy.removeValue(id); | ||
| for (String urlName : urlNames) { | ||
| cacheCopy.put(urlName, id); | ||
| } | ||
| } | ||
| m_detailIdCache = cacheCopy; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the cache needs to be updated for the resource, and if so, marks the structure id for updating.<p> | ||
| * | ||
| * @param structureId the structure id for the resource | ||
| * @param rootPath the path of the resource | ||
| * @param typeId the resource type id | ||
| */ | ||
| private void checkIfUpdateIsNeeded(CmsUUID structureId, String rootPath, int typeId) { | ||
|
|
||
| try { | ||
| I_CmsResourceType resType = OpenCms.getResourceManager().getResourceType(typeId); | ||
| if ((resType instanceof CmsResourceTypeXmlContent) | ||
| && !OpenCms.getResourceManager().matchResourceType( | ||
| CmsResourceTypeXmlContainerPage.RESOURCE_TYPE_NAME, | ||
| typeId)) { | ||
| markForUpdate(structureId); | ||
| } | ||
| } catch (CmsLoaderException e) { | ||
| // resource type not found, just log an error | ||
| LOG.error(e.getLocalizedMessage(), e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Reads the URL names for the id.<p> | ||
| * | ||
| * @param id the structure id of a resource | ||
| * @return the URL names for the resource | ||
| */ | ||
| private Set<String> getUrlNames(CmsUUID id) { | ||
|
|
||
| try { | ||
| return new HashSet<String>(m_cms.readUrlNamesForAllLocales(id)); | ||
| } catch (Exception e) { | ||
| LOG.error(e.getLocalizedMessage(), e); | ||
| return Collections.emptySet(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Marks the structure id for updating.<p> | ||
| * | ||
| * @param id the structure id to update | ||
| */ | ||
| private synchronized void markForUpdate(CmsUUID id) { | ||
|
|
||
| m_updateSet.add(id); | ||
| } | ||
|
|
||
| /** | ||
| * Loads the complete URL name data into the cache.<p> | ||
| */ | ||
| private void reload() { | ||
|
|
||
| CmsManyToOneMap<String, CmsUUID> newMap = new CmsManyToOneMap<String, CmsUUID>(); | ||
| try { | ||
| List<CmsUrlNameMappingEntry> mappings = m_cms.readUrlNameMappings(CmsUrlNameMappingFilter.ALL); | ||
| LOG.info("Initializing detail name cache with " + mappings.size() + " entries"); | ||
| for (CmsUrlNameMappingEntry entry : mappings) { | ||
| newMap.put(entry.getName(), entry.getStructureId()); | ||
| } | ||
| m_detailIdCache = newMap; | ||
| } catch (Exception e) { | ||
| LOG.error(e.getLocalizedMessage(), e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.