Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4389] magnoliamodules/trunk/openutils-mgnltagcloud/ src
|
From: <fg...@us...> - 2013-10-19 20:58:19
|
Revision: 4389
http://openutils.svn.sourceforge.net/openutils/?rev=4389&view=rev
Author: fgiust
Date: 2013-10-19 20:58:16 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
refactoring observedManagers
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
Copied: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java (from rev 4371, magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java 2013-10-19 20:58:16 UTC (rev 4389)
@@ -0,0 +1,319 @@
+/**
+ *
+ * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnltagcloud.manager;
+
+import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.observation.EventListener;
+
+import net.sourceforge.openutils.mgnltagcloud.bean.TagCloud;
+import net.sourceforge.openutils.mgnltagcloud.util.JackrabbitUtil;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections.Predicate;
+import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.core.query.lucene.NamespaceMappings;
+import org.apache.jackrabbit.core.query.lucene.SearchIndex;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.browseengine.bobo.api.BoboIndexReader;
+import com.browseengine.bobo.api.BoboSubBrowser;
+import com.browseengine.bobo.api.Browsable;
+import com.browseengine.bobo.api.BrowseException;
+import com.browseengine.bobo.api.BrowseFacet;
+import com.browseengine.bobo.api.BrowseRequest;
+import com.browseengine.bobo.api.BrowseResult;
+import com.browseengine.bobo.api.FacetAccessible;
+import com.browseengine.bobo.api.FacetSpec;
+import com.browseengine.bobo.api.FacetSpec.FacetSortSpec;
+import com.browseengine.bobo.facets.FacetHandler;
+import com.browseengine.bobo.facets.impl.MultiValueFacetHandler;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+@Singleton
+public class DefaultTagCloudManager extends ObservedManagerAdapter implements TagCloudManager
+{
+
+ /**
+ * tag clouds configured in jcr config repository
+ */
+ private Map<String, TagCloud> tagClouds = new HashMap<String, TagCloud>();
+
+ /**
+ * tag clouds generated at runtime
+ */
+ private Map<String, TagCloud> runtimeTagClouds = new HashMap<String, TagCloud>();
+
+ /**
+ * Repository listeners
+ */
+ private Map<String, EventListener> repositoryListeners = new HashMap<String, EventListener>();
+
+ @Inject
+ protected JackrabbitUtil jackrabbitUtil;
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(DefaultTagCloudManager.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onRegister(Node node)
+ {
+
+ Iterator<Node> allChildren;
+ try
+ {
+ allChildren = NodeUtil.collectAllChildren(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
+ while (allChildren.hasNext())
+ {
+ Node tagCloudNode = allChildren.next();
+ try
+ {
+ TagCloud tagCloud = (TagCloud) NodeUtilsExt.toBean(tagCloudNode, TagCloud.class);
+ if (!tagCloud.isEnabled())
+ {
+ continue;
+ }
+ tagClouds.put(NodeUtil.getName(tagCloudNode), tagCloud);
+ calculateTagCloud(tagCloud);
+ if (tagCloud.isCacheAndObserve() && !repositoryListeners.containsKey(tagCloud.getRepository()))
+ {
+ EventListener el = new TagCloudRepositoryObserver(tagCloud.getRepository());
+ ObservationUtil.registerChangeListener(tagCloud.getRepository(), "/", el);
+ repositoryListeners.put(tagCloud.getRepository(), el);
+ }
+ }
+ catch (Content2BeanException e)
+ {
+ log.warn("Error converting node " + NodeUtil.getPathIfPossible(tagCloudNode) + " to TagCloud class", e);
+ }
+ }
+ }
+
+ /**
+ * Unregister all jcr event listeners
+ */
+ public void stopObserving()
+ {
+ for (Map.Entry<String, EventListener> entry : repositoryListeners.entrySet())
+ {
+ ObservationUtil.unregisterChangeListener(entry.getKey(), entry.getValue());
+ }
+ }
+
+ /**
+ * Get tag clouds for a repository
+ * @param repository repository
+ * @return tag clouds map for a repository
+ */
+ @SuppressWarnings("unchecked")
+ public Map<String, TagCloud> getTagClouds(final String repository)
+ {
+ Map<String, TagCloud> allTagClouds = new HashMap<String, TagCloud>(tagClouds);
+ allTagClouds.putAll(runtimeTagClouds);
+ return MapUtils.predicatedMap(allTagClouds, null, new Predicate()
+ {
+
+ public boolean evaluate(Object object)
+ {
+ return ((TagCloud) object).isCacheAndObserve()
+ && repository.equals(((TagCloud) object).getRepository());
+ }
+ });
+ }
+
+ /**
+ * calculate tag cloud and store it in tagCloud.tags
+ * @param tagCloud tag cloud to calculate
+ */
+ public void calculateTagCloud(TagCloud tagCloud)
+ {
+ IndexReader ir = null;
+ try
+ {
+ // get index reader
+ Session session = jackrabbitUtil.getSession(tagCloud.getRepository());
+ SearchIndex si = jackrabbitUtil.getSearchIndex(tagCloud.getRepository(), session);
+ ir = si.getIndexReader();
+
+ NamespaceMappings namespaceMappings = si.getNamespaceMappings();
+ String propertyName = namespaceMappings.getPrefix(StringUtils.EMPTY)
+ + ":FULL:"
+ + tagCloud.getPropertyName();
+
+ // configure bobo for faceted search
+ MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName);
+ List<FacetHandler< ? >> handlerList = Arrays.asList(new FacetHandler< ? >[]{tagsHandler });
+ BoboIndexReader boboReader = HierarchyBoboIndexReader.getInstance(ir, handlerList);
+
+ // get query
+ Query q = new MatchAllDocsQuery();
+ if (StringUtils.isNotBlank(tagCloud.getPath()) && !"/".equals(tagCloud.getPath()))
+ {
+ q = jackrabbitUtil.getQuery(tagCloud.getPath(), session, si);
+ }
+
+ // build request for bobo
+ BrowseRequest br = new BrowseRequest();
+ br.setCount(0); // we are not interested in lucene hits
+ br.setOffset(0);
+ br.setQuery(q);
+
+ // add the facet output specs
+ FacetSpec tagsSpec = new FacetSpec();
+ tagsSpec.setOrderBy(FacetSortSpec.OrderHitsDesc);
+ tagsSpec.setMaxCount(tagCloud.getCount());
+
+ br.setFacetSpec(propertyName, tagsSpec);
+
+ Browsable browser = new BoboSubBrowser(boboReader);
+ try
+ {
+
+ // perform browse
+ BrowseResult result = browser.browse(br);
+
+ // get tags
+ Map<String, FacetAccessible> facetMap = result.getFacetMap();
+
+ FacetAccessible tagsFacets = facetMap.get(propertyName);
+ List<BrowseFacet> tagsVals = tagsFacets.getFacets();
+
+ // store them in tagCloud itself
+ tagCloud.setTags(new HashMap<String, Integer>());
+ for (BrowseFacet bf : tagsVals)
+ {
+ tagCloud.getTags().put(bf.getValue(), bf.getFacetValueHitCount());
+ }
+ }
+ finally
+ {
+ browser.close();
+ }
+
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Error retriving SearchIndex", ex);
+ }
+ catch (BrowseException ex)
+ {
+ log.error("Error making query", ex);
+ }
+ catch (IOException ex)
+ {
+ log.error("Error wrapping indexes", ex);
+ }
+ finally
+ {
+ if (ir != null)
+ {
+ try
+ {
+ ir.close();
+ }
+ catch (IOException e)
+ {
+ log.error("Error closing index reader", e);
+ }
+ }
+ }
+ }
+
+ public TagCloud getTagCloud(String name)
+ {
+ return tagClouds.get(name);
+ }
+
+ public TagCloud checkForTagCloud(final TagCloud tagCloud)
+ {
+ TagCloud found = (TagCloud) CollectionUtils.find(tagClouds.values(), new Predicate()
+ {
+
+ public boolean evaluate(Object object)
+ {
+ return tagCloud.equals(object);
+ }
+ });
+ if (found == null)
+ {
+ found = runtimeTagClouds.get(tagCloud.getName());
+ if (found == null)
+ {
+ calculateTagCloud(tagCloud);
+ runtimeTagClouds.put(tagCloud.getName(), tagCloud);
+ found = tagCloud;
+ if (!repositoryListeners.containsKey(tagCloud.getRepository()))
+ {
+ EventListener el = new TagCloudRepositoryObserver(tagCloud.getRepository());
+ ObservationUtil.registerChangeListener(tagCloud.getRepository(), "/", el);
+ repositoryListeners.put(tagCloud.getRepository(), el);
+ }
+ }
+ }
+ return found;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onClear()
+ {
+ tagClouds = new HashMap<String, TagCloud>();
+ }
+
+}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-10-19 20:58:07 UTC (rev 4388)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-10-19 20:58:16 UTC (rev 4389)
@@ -1,312 +1,24 @@
-/**
- *
- * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
package net.sourceforge.openutils.mgnltagcloud.manager;
-import info.magnolia.cms.util.ObservationUtil;
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.util.NodeUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.observation.EventListener;
-
import net.sourceforge.openutils.mgnltagcloud.bean.TagCloud;
-import net.sourceforge.openutils.mgnltagcloud.util.JackrabbitUtil;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.core.query.lucene.NamespaceMappings;
-import org.apache.jackrabbit.core.query.lucene.SearchIndex;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import com.browseengine.bobo.api.BoboIndexReader;
-import com.browseengine.bobo.api.BoboSubBrowser;
-import com.browseengine.bobo.api.Browsable;
-import com.browseengine.bobo.api.BrowseException;
-import com.browseengine.bobo.api.BrowseFacet;
-import com.browseengine.bobo.api.BrowseRequest;
-import com.browseengine.bobo.api.BrowseResult;
-import com.browseengine.bobo.api.FacetAccessible;
-import com.browseengine.bobo.api.FacetSpec;
-import com.browseengine.bobo.api.FacetSpec.FacetSortSpec;
-import com.browseengine.bobo.facets.FacetHandler;
-import com.browseengine.bobo.facets.impl.MultiValueFacetHandler;
-
-
/**
- * @author molaschi
+ * @author fgiust
* @version $Id$
*/
-@Singleton
-public class TagCloudManager extends ObservedManagerAdapter
+public interface TagCloudManager
{
- /**
- * tag clouds configured in jcr config repository
- */
- private Map<String, TagCloud> tagClouds = new HashMap<String, TagCloud>();
+ TagCloud getTagCloud(String name);
- /**
- * tag clouds generated at runtime
- */
- private Map<String, TagCloud> runtimeTagClouds = new HashMap<String, TagCloud>();
+ void calculateTagCloud(TagCloud tagCloud);
- /**
- * Repository listeners
- */
- private Map<String, EventListener> repositoryListeners = new HashMap<String, EventListener>();
+ Map<String, TagCloud> getTagClouds(final String repository);
- @Inject
- protected JackrabbitUtil jackrabbitUtil;
+ TagCloud checkForTagCloud(final TagCloud tagCloud);
- /**
- * {@inheritDoc}
- */
- @Override
- protected void onClear()
- {
- tagClouds = new HashMap<String, TagCloud>();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void onRegister(Node node)
- {
-
- Iterator<Node> allChildren;
- try
- {
- allChildren = NodeUtil.collectAllChildren(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator();
- }
- catch (RepositoryException e)
- {
- throw new RuntimeRepositoryException(e);
- }
-
- while (allChildren.hasNext())
- {
- Node tagCloudNode = allChildren.next();
- try
- {
- TagCloud tagCloud = (TagCloud) NodeUtilsExt.toBean(tagCloudNode, TagCloud.class);
- if (!tagCloud.isEnabled())
- {
- continue;
- }
- tagClouds.put(NodeUtil.getName(tagCloudNode), tagCloud);
- calculateTagCloud(tagCloud);
- if (tagCloud.isCacheAndObserve() && !repositoryListeners.containsKey(tagCloud.getRepository()))
- {
- EventListener el = new TagCloudRepositoryObserver(tagCloud.getRepository());
- ObservationUtil.registerChangeListener(tagCloud.getRepository(), "/", el);
- repositoryListeners.put(tagCloud.getRepository(), el);
- }
- }
- catch (Content2BeanException e)
- {
- log.warn("Error converting node " + NodeUtil.getPathIfPossible(tagCloudNode) + " to TagCloud class", e);
- }
- }
- }
-
- /**
- * Unregister all jcr event listeners
- */
- public void stopObserving()
- {
- for (Map.Entry<String, EventListener> entry : repositoryListeners.entrySet())
- {
- ObservationUtil.unregisterChangeListener(entry.getKey(), entry.getValue());
- }
- }
-
- /**
- * Get tag clouds for a repository
- * @param repository repository
- * @return tag clouds map for a repository
- */
- @SuppressWarnings("unchecked")
- public Map<String, TagCloud> getTagClouds(final String repository)
- {
- Map<String, TagCloud> allTagClouds = new HashMap<String, TagCloud>(tagClouds);
- allTagClouds.putAll(runtimeTagClouds);
- return MapUtils.predicatedMap(allTagClouds, null, new Predicate()
- {
-
- public boolean evaluate(Object object)
- {
- return ((TagCloud) object).isCacheAndObserve()
- && repository.equals(((TagCloud) object).getRepository());
- }
- });
- }
-
- /**
- * calculate tag cloud and store it in tagCloud.tags
- * @param tagCloud tag cloud to calculate
- */
- public void calculateTagCloud(TagCloud tagCloud)
- {
- IndexReader ir = null;
- try
- {
- // get index reader
- Session session = jackrabbitUtil.getSession(tagCloud.getRepository());
- SearchIndex si = jackrabbitUtil.getSearchIndex(tagCloud.getRepository(), session);
- ir = si.getIndexReader();
-
- NamespaceMappings namespaceMappings = si.getNamespaceMappings();
- String propertyName = namespaceMappings.getPrefix(StringUtils.EMPTY)
- + ":FULL:"
- + tagCloud.getPropertyName();
-
- // configure bobo for faceted search
- MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName);
- List<FacetHandler< ? >> handlerList = Arrays.asList(new FacetHandler< ? >[]{tagsHandler });
- BoboIndexReader boboReader = HierarchyBoboIndexReader.getInstance(ir, handlerList);
-
- // get query
- Query q = new MatchAllDocsQuery();
- if (StringUtils.isNotBlank(tagCloud.getPath()) && !"/".equals(tagCloud.getPath()))
- {
- q = jackrabbitUtil.getQuery(tagCloud.getPath(), session, si);
- }
-
- // build request for bobo
- BrowseRequest br = new BrowseRequest();
- br.setCount(0); // we are not interested in lucene hits
- br.setOffset(0);
- br.setQuery(q);
-
- // add the facet output specs
- FacetSpec tagsSpec = new FacetSpec();
- tagsSpec.setOrderBy(FacetSortSpec.OrderHitsDesc);
- tagsSpec.setMaxCount(tagCloud.getCount());
-
- br.setFacetSpec(propertyName, tagsSpec);
-
- Browsable browser = new BoboSubBrowser(boboReader);
- try
- {
-
- // perform browse
- BrowseResult result = browser.browse(br);
-
- // get tags
- Map<String, FacetAccessible> facetMap = result.getFacetMap();
-
- FacetAccessible tagsFacets = facetMap.get(propertyName);
- List<BrowseFacet> tagsVals = tagsFacets.getFacets();
-
- // store them in tagCloud itself
- tagCloud.setTags(new HashMap<String, Integer>());
- for (BrowseFacet bf : tagsVals)
- {
- tagCloud.getTags().put(bf.getValue(), bf.getFacetValueHitCount());
- }
- }
- finally
- {
- browser.close();
- }
-
- }
- catch (RepositoryException ex)
- {
- log.error("Error retriving SearchIndex", ex);
- }
- catch (BrowseException ex)
- {
- log.error("Error making query", ex);
- }
- catch (IOException ex)
- {
- log.error("Error wrapping indexes", ex);
- }
- finally
- {
- if (ir != null)
- {
- try
- {
- ir.close();
- }
- catch (IOException e)
- {
- log.error("Error closing index reader", e);
- }
- }
- }
- }
-
- public TagCloud getTagCloud(String name)
- {
- return tagClouds.get(name);
- }
-
- public TagCloud checkForTagCloud(final TagCloud tagCloud)
- {
- TagCloud found = (TagCloud) CollectionUtils.find(tagClouds.values(), new Predicate()
- {
-
- public boolean evaluate(Object object)
- {
- return tagCloud.equals(object);
- }
- });
- if (found == null)
- {
- found = runtimeTagClouds.get(tagCloud.getName());
- if (found == null)
- {
- calculateTagCloud(tagCloud);
- runtimeTagClouds.put(tagCloud.getName(), tagCloud);
- found = tagCloud;
- if (!repositoryListeners.containsKey(tagCloud.getRepository()))
- {
- EventListener el = new TagCloudRepositoryObserver(tagCloud.getRepository());
- ObservationUtil.registerChangeListener(tagCloud.getRepository(), "/", el);
- repositoryListeners.put(tagCloud.getRepository(), el);
- }
- }
- }
- return found;
- }
-
+ void stopObserving();
}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java 2013-10-19 20:58:07 UTC (rev 4388)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/module/TagCloudModule.java 2013-10-19 20:58:16 UTC (rev 4389)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnltagcloud.module;
+import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
import info.magnolia.objectfactory.Components;
@@ -49,7 +50,7 @@
moduleLifecycleContext.registerModuleObservingComponent(
"clouds",
- Components.getComponent(TagCloudManager.class));
+ (ObservedManager) Components.getComponent(TagCloudManager.class));
}
/**
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2013-10-19 20:58:07 UTC (rev 4388)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java 2013-10-19 20:58:16 UTC (rev 4389)
@@ -23,13 +23,16 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.SamplesExtractionTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
import java.util.List;
+import net.sourceforge.openutils.mgnltagcloud.manager.DefaultTagCloudManager;
+
/**
* @author cstrappazzon
* @version $Id$
@@ -52,6 +55,12 @@
tasks.add(new SamplesExtractionTask());
}
+ tasks.add(new CreateMissingPropertyTask(
+ "config",
+ "/modules/tagcloud/clouds",
+ "class",
+ DefaultTagCloudManager.class.getName()));
+
return tasks;
}
}
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml 2013-10-19 20:58:07 UTC (rev 4388)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/magnolia/tagcloud.xml 2013-10-19 20:58:16 UTC (rev 4389)
@@ -5,13 +5,19 @@
<displayName>tagcloud</displayName>
<description>Openutils - Magnolia Tagcloud Library</description>
<class>net.sourceforge.openutils.mgnltagcloud.module.TagCloudModule</class>
- <versionHandler>net.sourceforge.openutils.mgnltagcloud.setup.TagCloudModuleVersionHandler</versionHandler>
+ <versionHandler>net.sourceforge.openutils.mgnltagcloud.setup.TagCloudModuleVersionHandler</versionHandler>
<version>${project.version}</version>
<components>
<id>main</id>
<component>
<type>net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager</type>
- <implementation>net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager</implementation>
+ <implementation>net.sourceforge.openutils.mgnltagcloud.manager.DefaultTagCloudManager</implementation>
+ <!--
+ <workspace>config</workspace>
+ <path>/modules/tagcloud/clouds</path>
+ <observed>true</observed>
+ <scope>singleton</scope>
+ -->
</component>
<component>
<type>net.sourceforge.openutils.mgnltagcloud.util.JackrabbitUtil</type>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-10-19 20:58:07 UTC (rev 4388)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-10-19 20:58:16 UTC (rev 4389)
@@ -272,7 +272,7 @@
hmConfig.save();
- TagCloudManager manager = Components.getComponent(TagCloudManager.class);
+ DefaultTagCloudManager manager = (DefaultTagCloudManager) Components.getComponent(TagCloudManager.class);
manager.jackrabbitUtil = new JackrabbitUtil();
manager.onRegister(contentCloud);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
