You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2013-10-19 20:58:39
|
Revision: 4390
http://openutils.svn.sourceforge.net/openutils/?rev=4390&view=rev
Author: fgiust
Date: 2013-10-19 20:58:36 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
new renderExceptionHandler
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/RuntimeRenderException.java
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java 2013-10-19 20:58:36 UTC (rev 4390)
@@ -0,0 +1,125 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnlutils.util;
+
+import info.magnolia.cms.beans.config.ServerConfiguration;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.init.MagnoliaConfigurationProperties;
+import info.magnolia.rendering.context.RenderingContext;
+import info.magnolia.rendering.engine.RenderException;
+import info.magnolia.rendering.engine.RenderExceptionHandler;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+
+import javax.inject.Inject;
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Simple exception renderer that avoid the ugly yellow box that popped up in magnolia 4.5. Just let the exception flow
+ * up to tomcat, which usually shows a more meaningful error page.
+ * @author fgiust
+ * @version $Id$
+ */
+public class ClassicRenderExceptionHandler implements RenderExceptionHandler
+{
+
+ private static Logger log = LoggerFactory.getLogger(ClassicRenderExceptionHandler.class);
+
+ private ServerConfiguration serverConfiguration;
+
+ private MagnoliaConfigurationProperties configurationProperties;
+
+ @Inject
+ public ClassicRenderExceptionHandler(ServerConfiguration config)
+ {
+ this.serverConfiguration = config;
+ }
+
+ @Inject
+ public void setConfigurationProperties(MagnoliaConfigurationProperties configurationProperties)
+ {
+ this.configurationProperties = configurationProperties;
+ }
+
+ @Override
+ public void handleException(RenderException renderException, RenderingContext renderingContext)
+ {
+ String path;
+ try
+ {
+ path = renderingContext.getCurrentContent().getPath();
+ }
+ catch (RepositoryException e)
+ {
+ path = "Can't read content";
+ }
+ String id = renderingContext.getRenderableDefinition().getId();
+
+ String msg = "Error while rendering ["
+ + path
+ + "] with template ["
+ + id
+ + "]: "
+ + ExceptionUtils.getMessage(renderException);
+ if (serverConfiguration.isAdmin() || configurationProperties.getBooleanProperty("magnolia.develop"))
+ {
+ log.error(msg, renderException);
+
+ throw new RuntimeRenderException(renderException);
+ }
+ else
+ {
+ log.error(msg, renderException);
+
+ try
+ {
+ PrintWriter out = getPrintWriterFor(renderingContext.getAppendable());
+ out.write("\n <!-- ");
+ out.write(msg);
+ out.write("\n-->\n");
+
+ out.flush();
+ }
+
+ catch (IOException e)
+ {
+ throw new RuntimeException("Can't log template exception.", e);
+ }
+ }
+
+ }
+
+ private PrintWriter getPrintWriterFor(Writer out)
+ {
+ return (out instanceof PrintWriter) ? (PrintWriter) out : new PrintWriter(out);
+ }
+
+ protected void inPublicMode(String msg, RenderException renderException, PrintWriter out)
+ {
+ log.error(msg, renderException);
+ }
+
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ClassicRenderExceptionHandler.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/RuntimeRenderException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/RuntimeRenderException.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/RuntimeRenderException.java 2013-10-19 20:58:36 UTC (rev 4390)
@@ -0,0 +1,37 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnlutils.util;
+
+import info.magnolia.rendering.engine.RenderException;
+
+
+/**
+ * Runtime version of RenderException, used to let exceptions flow up to tomcat.
+ * @author fgiust
+ * @version $Id$
+ */
+public class RuntimeRenderException extends RuntimeException
+{
+
+ public RuntimeRenderException(RenderException cause)
+ {
+ super(cause.getMessage(), cause.getCause());
+ }
+
+}
Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/RuntimeRenderException.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml 2013-10-19 20:58:16 UTC (rev 4389)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml 2013-10-19 20:58:36 UTC (rev 4390)
@@ -7,14 +7,25 @@
<class>it.openutils.mgnlutils.setup.MgnlUtilsModule</class>
<versionHandler>it.openutils.mgnlutils.setup.MgnlUtilsModuleVersionHandler</versionHandler>
<version>${project.version}</version>
+ <components>
+ <id>main</id>
+ <component>
+ <type>info.magnolia.rendering.engine.RenderExceptionHandler</type>
+ <implementation>it.openutils.mgnlutils.util.ClassicRenderExceptionHandler</implementation>
+ </component>
+ </components>
<dependencies>
<dependency>
<name>core</name>
- <version>4.5/*</version>
+ <version>4.5.11/*</version>
</dependency>
<dependency>
<name>criteria</name>
<version>5.0.1/*</version>
</dependency>
+ <dependency>
+ <name>rendering</name>
+ <version>4.5.11/*</version>
+ </dependency>
</dependencies>
</module>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <fg...@us...> - 2013-10-19 20:58:12
|
Revision: 4388
http://openutils.svn.sourceforge.net/openutils/?rev=4388&view=rev
Author: fgiust
Date: 2013-10-19 20:58:07 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
refactoring observedManagers
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.entries.website.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.website.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -21,6 +21,7 @@
import info.magnolia.cms.beans.runtime.MultipartForm;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import java.io.File;
import java.util.HashMap;
@@ -45,8 +46,8 @@
public static ExternalVideoProvider getExternalVideoProvider(Node media)
{
- MediaTypeHandler mth = MediaConfigurationManager
- .getInstance()
+ MediaTypeHandler mth = Components
+ .getComponent(MediaConfigurationManager.class)
.getMediaTypeConfigurationFromMedia(media)
.getHandler();
if (mth.getClass().isAssignableFrom(ExternalVideoTypeHandler.class))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
+import info.magnolia.objectfactory.Components;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -45,7 +47,9 @@
return super.getOptions();
}
List<Option> options = new ArrayList<Option>();
- Map<String, MediaTypeConfiguration> mediatype = MediaConfigurationManager.getInstance().getTypes();
+ Map<String, MediaTypeConfiguration> mediatype = Components
+ .getComponent(MediaConfigurationManager.class)
+ .getTypes();
Option option;
for (String media : mediatype.keySet())
{
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultImageProcessorsManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -0,0 +1,277 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-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.mgnlmedia.media.configuration;
+
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Singleton;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.FitInImageResolutionProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ImagePostProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ImageResolutionProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor;
+import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * ObservedManager that manages the maps of processors that handle images resize and processors that do operation on
+ * images after the resize. <br/>
+ * default image resolution processors:
+ * <table>
+ * <tbody>
+ * <tr>
+ * <td>control chars</td>
+ * <td>image resolution processor</td>
+ * <td>description</td>
+ * </tr>
+ * <tr>
+ * <td>b, o</td>
+ * <td>{@link FitInAndFillWithBandsImageResolutionProcessor}</td>
+ * <td>resize image to fit in required resolution and fills empty areas by color passed in parameters as "background"</td>
+ * </tr>
+ * <tr>
+ * <td>l</td>
+ * <td>{@link FitInImageResolutionProcessor}</td>
+ * <td>resize image to fit in required resolution</td>
+ * </tr>
+ * <tr>
+ * <td>x</td>
+ * <td>{@link ResizeNoCropImageResolutionProcessor}</td>
+ * <td>resize image to contain required resolution</td>
+ * </tr>
+ * <tr>
+ * <td>no control char (default), c</td>
+ * <td>{@link ResizeCropCenteredImageResolutionProcessor}</td>
+ * <td>resize image to contain required resolution, and crop simmetric bands that outfits the required resolution rect</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * @author molaschi
+ * @version $Id: $
+ */
+@Singleton
+public class DefaultImageProcessorsManager extends ObservedManagerAdapter implements ImageProcessorsManager
+{
+
+ private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
+
+ private static final String IMAGE_POST_PROCESSORS_NAME = "image-post";
+
+ private Map<String, ImageResolutionProcessor> imageResProcs = new HashMap<String, ImageResolutionProcessor>();
+
+ private Map<String, ImagePostProcessor> imagePostProcs = new HashMap<String, ImagePostProcessor>();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onClear()
+ {
+ imageResProcs.clear();
+ imagePostProcs.clear();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void onRegister(Node parentNode)
+ {
+
+ Iterable<Node> nodes;
+ try
+ {
+ nodes = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error initializing image processor configuration", e);
+ return;
+ }
+
+ for (Node processorsNode : nodes)
+ {
+
+ Iterable<Node> processors;
+ try
+ {
+ processors = NodeUtil.getNodes(processorsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log
+ .error(
+ "Error initializing image processor configuration for " + NodeUtil.getName(processorsNode),
+ e);
+ continue;
+ }
+
+ for (Node node : processors)
+ {
+ try
+ {
+
+ if (IMAGE_POST_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
+ {
+ String classNameHandler = PropertyUtil.getString(node, "class");
+ Class classHandler = Class.forName(classNameHandler);
+ if (!ImagePostProcessor.class.isAssignableFrom(classHandler))
+ {
+ log.error(
+ "Error getting post processor for {}: class {} not implements ImagePostProcessor",
+ NodeUtil.getPathIfPossible(node),
+ classHandler);
+ continue;
+ }
+
+ ImagePostProcessor imagePostProcessor = (ImagePostProcessor) classHandler.newInstance();
+ imagePostProcs.put(NodeUtil.getName(node), imagePostProcessor);
+ }
+
+ if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
+ {
+ String controlChar = NodeUtil.getName(node);
+
+ String classNameHandler = PropertyUtil.getString(node, "class");
+ Class classHandler = Class.forName(classNameHandler);
+ if (!ImageResolutionProcessor.class.isAssignableFrom(classHandler))
+ {
+ log
+ .error(
+ "Error getting resolution processor for {}: class {} not implements ImageResolutionProcessor",
+ NodeUtil.getPathIfPossible(node),
+ classHandler);
+ continue;
+ }
+
+ ImageResolutionProcessor imageResolutionProcessor = (ImageResolutionProcessor) classHandler
+ .newInstance();
+ if (!controlChar.equals("default"))
+ {
+ controlChar = controlChar.substring(0, 1);
+ }
+ imageResProcs.put(controlChar, imageResolutionProcessor);
+ try
+ {
+ if (node.hasProperty("aliases"))
+ {
+ String[] aliases = StringUtils.split(PropertyUtil.getString(node, "aliases"), ",");
+ for (String alias : aliases)
+ {
+ imageResProcs.put(alias, imageResolutionProcessor);
+ }
+ }
+ }
+ catch (RepositoryException ex)
+ {
+ // go on
+ }
+ }
+ }
+ catch (InstantiationException ex)
+ {
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
+ }
+ catch (IllegalAccessException ex)
+ {
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
+ }
+ catch (RuntimeException ex)
+ {
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
+ }
+ }
+ }
+ }
+
+ /**
+ * Get image resolution processor for a given control char
+ * @param controlChar resolution control char
+ * @return image resolution processor for a given control char
+ */
+ public ImageResolutionProcessor getImageResolutionProcessor(char controlChar)
+ {
+ return imageResProcs.get(String.valueOf(controlChar));
+ }
+
+ /**
+ * Check if control char is registered
+ * @param controlChar control char to check
+ * @return true if control char is registered
+ */
+ public boolean isValidControlChar(char controlChar)
+ {
+ return imageResProcs.keySet().contains(String.valueOf(controlChar));
+ }
+
+ /**
+ * Get the default image resolution processor (by default config is
+ * {@link ResizeCropCenteredImageResolutionProcessor})
+ * @return the default image resolution processor
+ */
+ public ImageResolutionProcessor getDefaultImageResolutionProcessor()
+ {
+ return imageResProcs.get("default");
+ }
+
+ /**
+ * Get image post processor by its name
+ * @param name image post processor name
+ * @return image post processor
+ */
+ public ImagePostProcessor getImagePostProcessor(String name)
+ {
+ return imagePostProcs.get(name);
+ }
+
+ /**
+ * Get all image post processors
+ * @return image post processors list
+ */
+ public Collection<ImagePostProcessor> getImagePostProcessorsList()
+ {
+ return imagePostProcs.values();
+ }
+
+ /**
+ * Get the map of image post processors
+ * @return image post processors map
+ */
+ public Map<String, ImagePostProcessor> getImagePostProcessorsMap()
+ {
+ return imagePostProcs;
+ }
+}
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -0,0 +1,209 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-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.mgnlmedia.media.configuration;
+
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+import info.magnolia.cms.beans.config.URI2RepositoryMapping;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+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 net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * ObservedManager that keeps that media types configuration.<br/>
+ * Each media type is defined under the mediatypes contentnode in /modules/media.<br/>
+ * I.e.<br/>
+ * /modules/media/mediatypes/pdf<br/>
+ * <ul>
+ * <li>label = pdf file</li>
+ * <li>handler = info.acme.PdfTypeHandler</li>
+ * <li>menuIcon = .resources/pdf/icons/pdf16.gif</li>
+ * <li>extensions = pdf</li>
+ * </ul>
+ * @author molaschi
+ */
+@Singleton
+public class DefaultMediaConfigurationManager extends ObservedManagerAdapter implements MediaConfigurationManager
+{
+
+ private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
+
+ private Map<String, MediaTypeConfiguration> types = new LinkedHashMap<String, MediaTypeConfiguration>();
+
+ @Inject
+ private URI2RepositoryManager uri2RepositoryManager;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void onClear()
+ {
+ types.clear();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ protected void onRegister(Node node)
+ {
+
+ try
+ {
+ for (Iterator<Node> iter = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator(); iter
+ .hasNext();)
+ {
+ Node typeNode = iter.next();
+
+ if (!PropertyUtil.getBoolean(typeNode, "enabled", true))
+ {
+ continue;
+ }
+
+ try
+ {
+ MediaTypeConfiguration conf = (MediaTypeConfiguration) NodeUtilsExt.toBean(
+ typeNode,
+ true,
+ MediaTypeConfiguration.class);
+
+ if (conf.getHandler() != null)
+ {
+ conf.getHandler().init(typeNode);
+ }
+ else
+ {
+ log.error("Missing handler for media type {}", typeNode.getName());
+ continue;
+ }
+
+ types.put(typeNode.getName(), conf);
+ }
+ catch (Throwable e)
+ {
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
+ }
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error getting nodes for {}", NodeUtil.getPathIfPossible(node), e);
+ }
+ }
+
+ /**
+ * Get the media type from a file extension
+ * @param extension file extension
+ * @return media type
+ */
+ public MediaTypeConfiguration getMediaHandlerFromExtension(String extension)
+ {
+ if (extension == null)
+ {
+ return null;
+ }
+
+ String lowerCasedExtension = extension.toLowerCase();
+ for (Map.Entry<String, MediaTypeConfiguration> entry : getTypes().entrySet())
+ {
+
+ MediaTypeConfiguration value = entry.getValue();
+
+ List<String> extensionsList = value.getExtensionsList();
+
+ if (extensionsList != null && extensionsList.contains(lowerCasedExtension))
+ {
+ return entry.getValue();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Get all media type map
+ * @return media type map
+ */
+ public Map<String, MediaTypeConfiguration> getTypes()
+ {
+ return types;
+ }
+
+ /**
+ * Get the type configuration for a media
+ * @param media media
+ * @return type configuration
+ */
+ public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Node media)
+ {
+ try
+ {
+ if (!StringUtils.equals(media.getPrimaryNodeType().getName(), NT_MEDIA))
+ {
+ return null;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error getting item type on node {} module media", NodeUtil.getPathIfPossible(media), e);
+ return null;
+ }
+
+ return types.get(PropertyUtil.getString(media, "type"));
+ }
+
+ /**
+ * Get uri mapping for repo
+ * @return uri mapping for repo
+ */
+ @Override
+ public String getURIMappingPrefix()
+ {
+ Collection<URI2RepositoryMapping> mappings = uri2RepositoryManager.getMappings();
+ for (URI2RepositoryMapping mapping : mappings)
+ {
+ if (mapping.getRepository().equals(MediaModule.REPO))
+ {
+ return mapping.getURIPrefix();
+ }
+ }
+ return StringUtils.EMPTY;
+ }
+}
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -0,0 +1,130 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-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.mgnlmedia.media.configuration;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Singleton;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Disjunction;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+@Singleton
+public class DefaultMediaUsedInManager implements MediaUsedInManager
+{
+
+ private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
+
+ private Map<String, UsedInWorkspace> usedInWorkspaceMap = new HashMap<String, UsedInWorkspace>();
+
+ public Map<String, UsedInWorkspace> getEntries()
+ {
+ return usedInWorkspaceMap;
+ }
+
+ public void setEntries(Map<String, UsedInWorkspace> entries)
+ {
+ this.usedInWorkspaceMap = entries;
+ }
+
+ public Map<String, AdvancedResult> getUsedIn(String mediaUUID)
+ {
+ Map<String, AdvancedResult> map = new HashMap<String, AdvancedResult>(usedInWorkspaceMap.size());
+ for (String workspaceName : usedInWorkspaceMap.keySet())
+ {
+ map.put(workspaceName, getUsedInWorkspace(mediaUUID, workspaceName));
+ }
+ return map;
+ }
+
+ public AdvancedResult getUsedInWorkspace(String mediaUUID, String workspaceName)
+ {
+ UsedInWorkspace uiw = usedInWorkspaceMap.get(workspaceName);
+ if (uiw == null)
+ {
+ return AdvancedResult.EMPTY_RESULT;
+ }
+
+ return getUsedInWorkspaceNodes(mediaUUID, uiw);
+ }
+
+ private AdvancedResult getUsedInWorkspaceNodes(String mediaUUID, UsedInWorkspace uiw)
+
+ {
+ List<Node> nodes = new ArrayList<Node>();
+ Set<String> handles = new HashSet<String>();
+
+ String basepath = "/jcr:root" + StringUtils.defaultString(uiw.getBasepath(), "/");
+
+ if (!StringUtils.endsWith(basepath, "/"))
+ {
+ basepath = basepath + "/";
+ }
+ basepath = basepath + "/*";
+
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(uiw.getWorkspaceName())
+ .setBasePath(basepath)
+ .addOrder(Order.desc("@jcr:score"));
+
+ criteria.add(Restrictions.not(Restrictions.in("@jcr:primaryType", uiw.getNodetypes())));
+
+ Disjunction properties = Restrictions.disjunction();
+ for (String string : uiw.getProperties())
+ {
+ properties.add(Restrictions.contains(string, mediaUUID));
+ }
+ criteria.add(properties);
+
+ AdvancedResult result = criteria.execute();
+
+ log.debug("{} > {}", criteria.toXpathExpression(), result.getTotalSize());
+
+ return result;
+ }
+}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -19,269 +19,30 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
-import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
-import javax.inject.Singleton;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
-import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
-import net.sourceforge.openutils.mgnlmedia.media.processors.FitInImageResolutionProcessor;
import net.sourceforge.openutils.mgnlmedia.media.processors.ImagePostProcessor;
import net.sourceforge.openutils.mgnlmedia.media.processors.ImageResolutionProcessor;
-import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeCropCenteredImageResolutionProcessor;
-import net.sourceforge.openutils.mgnlmedia.media.processors.ResizeNoCropImageResolutionProcessor;
-import org.apache.commons.lang.StringUtils;
-
/**
- * ObservedManager that manages the maps of processors that handle images resize and processors that do operation on
- * images after the resize. <br/>
- * default image resolution processors:
- * <table>
- * <tbody>
- * <tr>
- * <td>control chars</td>
- * <td>image resolution processor</td>
- * <td>description</td>
- * </tr>
- * <tr>
- * <td>b, o</td>
- * <td>{@link FitInAndFillWithBandsImageResolutionProcessor}</td>
- * <td>resize image to fit in required resolution and fills empty areas by color passed in parameters as "background"</td>
- * </tr>
- * <tr>
- * <td>l</td>
- * <td>{@link FitInImageResolutionProcessor}</td>
- * <td>resize image to fit in required resolution</td>
- * </tr>
- * <tr>
- * <td>x</td>
- * <td>{@link ResizeNoCropImageResolutionProcessor}</td>
- * <td>resize image to contain required resolution</td>
- * </tr>
- * <tr>
- * <td>no control char (default), c</td>
- * <td>{@link ResizeCropCenteredImageResolutionProcessor}</td>
- * <td>resize image to contain required resolution, and crop simmetric bands that outfits the required resolution rect</td>
- * </tr>
- * </tbody>
- * </table>
- * @author molaschi
+ * @author fgiust
* @version $Id: $
*/
-@Singleton
-public class ImageProcessorsManager extends ObservedManagerAdapter
+public interface ImageProcessorsManager
{
- private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
+ ImageResolutionProcessor getImageResolutionProcessor(char controlChar);
- private static final String IMAGE_POST_PROCESSORS_NAME = "image-post";
+ boolean isValidControlChar(char controlChar);
- private Map<String, ImageResolutionProcessor> imageResProcs = new HashMap<String, ImageResolutionProcessor>();
+ ImageResolutionProcessor getDefaultImageResolutionProcessor();
- private Map<String, ImagePostProcessor> imagePostProcs = new HashMap<String, ImagePostProcessor>();
+ ImagePostProcessor getImagePostProcessor(String name);
- /**
- * Get singleton instance
- * @return singleton manager instance
- */
- public static ImageProcessorsManager getInstance()
- {
- return Components.getComponent(ImageProcessorsManager.class);
- }
+ Collection<ImagePostProcessor> getImagePostProcessorsList();
- /**
- * {@inheritDoc}
- */
- @Override
- protected void onClear()
- {
- imageResProcs.clear();
- imagePostProcs.clear();
- }
+ Map<String, ImagePostProcessor> getImagePostProcessorsMap();
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- @Override
- protected void onRegister(Node parentNode)
- {
-
- Iterable<Node> nodes;
- try
- {
- nodes = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
- }
- catch (RepositoryException e)
- {
- log.error("Error initializing image processor configuration", e);
- return;
- }
-
- for (Node processorsNode : nodes)
- {
-
- Iterable<Node> processors;
- try
- {
- processors = NodeUtil.getNodes(processorsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
- }
- catch (RepositoryException e)
- {
- log
- .error(
- "Error initializing image processor configuration for " + NodeUtil.getName(processorsNode),
- e);
- continue;
- }
-
- for (Node node : processors)
- {
- try
- {
-
- if (IMAGE_POST_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
- {
- String classNameHandler = PropertyUtil.getString(node, "class");
- Class classHandler = Class.forName(classNameHandler);
- if (!ImagePostProcessor.class.isAssignableFrom(classHandler))
- {
- log.error(
- "Error getting post processor for {}: class {} not implements ImagePostProcessor",
- NodeUtil.getPathIfPossible(node),
- classHandler);
- continue;
- }
-
- ImagePostProcessor imagePostProcessor = (ImagePostProcessor) classHandler.newInstance();
- imagePostProcs.put(NodeUtil.getName(node), imagePostProcessor);
- }
-
- if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
- {
- String controlChar = NodeUtil.getName(node);
-
- String classNameHandler = PropertyUtil.getString(node, "class");
- Class classHandler = Class.forName(classNameHandler);
- if (!ImageResolutionProcessor.class.isAssignableFrom(classHandler))
- {
- log
- .error(
- "Error getting resolution processor for {}: class {} not implements ImageResolutionProcessor",
- NodeUtil.getPathIfPossible(node),
- classHandler);
- continue;
- }
-
- ImageResolutionProcessor imageResolutionProcessor = (ImageResolutionProcessor) classHandler
- .newInstance();
- if (!controlChar.equals("default"))
- {
- controlChar = controlChar.substring(0, 1);
- }
- imageResProcs.put(controlChar, imageResolutionProcessor);
- try
- {
- if (node.hasProperty("aliases"))
- {
- String[] aliases = StringUtils.split(PropertyUtil.getString(node, "aliases"), ",");
- for (String alias : aliases)
- {
- imageResProcs.put(alias, imageResolutionProcessor);
- }
- }
- }
- catch (RepositoryException ex)
- {
- // go on
- }
- }
- }
- catch (InstantiationException ex)
- {
- log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
- }
- catch (IllegalAccessException ex)
- {
- log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
- }
- catch (ClassNotFoundException ex)
- {
- log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
- }
- catch (RuntimeException ex)
- {
- log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
- }
- }
- }
- }
-
- /**
- * Get image resolution processor for a given control char
- * @param controlChar resolution control char
- * @return image resolution processor for a given control char
- */
- public ImageResolutionProcessor getImageResolutionProcessor(char controlChar)
- {
- return imageResProcs.get(String.valueOf(controlChar));
- }
-
- /**
- * Check if control char is registered
- * @param controlChar control char to check
- * @return true if control char is registered
- */
- public boolean isValidControlChar(char controlChar)
- {
- return imageResProcs.keySet().contains(String.valueOf(controlChar));
- }
-
- /**
- * Get the default image resolution processor (by default config is
- * {@link ResizeCropCenteredImageResolutionProcessor})
- * @return the default image resolution processor
- */
- public ImageResolutionProcessor getDefaultImageResolutionProcessor()
- {
- return imageResProcs.get("default");
- }
-
- /**
- * Get image post processor by its name
- * @param name image post processor name
- * @return image post processor
- */
- public ImagePostProcessor getImagePostProcessor(String name)
- {
- return imagePostProcs.get(name);
- }
-
- /**
- * Get all image post processors
- * @return image post processors list
- */
- public Collection<ImagePostProcessor> getImagePostProcessorsList()
- {
- return imagePostProcs.values();
- }
-
- /**
- * Get the map of image post processors
- * @return image post processors map
- */
- public Map<String, ImagePostProcessor> getImagePostProcessorsMap()
- {
- return imagePostProcs;
- }
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -19,280 +19,31 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.URI2RepositoryManager;
-import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.jcr.util.PropertyUtil;
-import info.magnolia.objectfactory.Components;
-import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
-import javax.inject.Singleton;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.query.InvalidQueryException;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
/**
- * ObservedManager that keeps that media types configuration.<br/>
- * Each media type is defined under the mediatypes contentnode in /modules/media.<br/>
- * I.e.<br/>
- * /modules/media/mediatypes/pdf<br/>
- * <ul>
- * <li>label = pdf file</li>
- * <li>handler = info.acme.PdfTypeHandler</li>
- * <li>menuIcon = .resources/pdf/icons/pdf16.gif</li>
- * <li>extensions = pdf</li>
- * </ul>
- * @author molaschi
+ * @author fgiust
+ * @version $Id$
*/
-@Singleton
-public class MediaConfigurationManager extends ObservedManagerAdapter
+public interface MediaConfigurationManager
{
- private static final String MGNL_MEDIA_TYPE = "mgnl:media";
+ String NT_FOLDER = MgnlNodeType.NT_CONTENT;
- private static final String MGNL_RESOLUTION_TYPE = "mgnl:resolutions";
+ String NT_MEDIA = "mgnl:media";
- /**
- * Folder type
- */
- public static final String NT_FOLDER = MgnlNodeType.NT_CONTENT;
+ String NT_RESOLUTIONS = "mgnl:resolutions";
- /**
- * Media type
- */
- public static final String NT_MEDIA = MGNL_MEDIA_TYPE;
+ String getURIMappingPrefix();
- /**
- * Resolutions node type
- */
- public static final String NT_RESOLUTIONS = MGNL_RESOLUTION_TYPE;
+ MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Node media);
- private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
+ Map<String, MediaTypeConfiguration> getTypes();
- private Map<String, MediaTypeConfiguration> types = new LinkedHashMap<String, MediaTypeConfiguration>();
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void onClear()
- {
- types.clear();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("unchecked")
- protected void onRegister(Node node)
- {
-
- try
- {
- for (Iterator<Node> iter = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator(); iter
- .hasNext();)
- {
- Node typeNode = iter.next();
-
- if (!PropertyUtil.getBoolean(typeNode, "enabled", true))
- {
- continue;
- }
-
- try
- {
- MediaTypeConfiguration conf = (MediaTypeConfiguration) NodeUtilsExt.toBean(
- typeNode,
- true,
- MediaTypeConfiguration.class);
-
- if (conf.getHandler() != null)
- {
- conf.getHandler().init(typeNode);
- }
- else
- {
- log.error("Missing handler for media type {}", typeNode.getName());
- continue;
- }
-
- types.put(typeNode.getName(), conf);
- }
- catch (Throwable e)
- {
- log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
- }
- }
- }
- catch (RepositoryException e)
- {
- log.error("Error getting nodes for {}", NodeUtil.getPathIfPossible(node), e);
- }
- }
-
- /**
- * Get singleton instance
- * @return singleton instance
- */
- public static MediaConfigurationManager getInstance()
- {
- return Components.getComponent(MediaConfigurationManager.class);
- }
-
- /**
- * Get the media type from a file extension
- * @param extension file extension
- * @return media type
- */
- public static MediaTypeConfiguration getMediaHandlerFromExtension(String extension)
- {
- if (extension == null)
- {
- return null;
- }
-
- String lowerCasedExtension = extension.toLowerCase();
- for (Map.Entry<String, MediaTypeConfiguration> entry : MediaConfigurationManager
- .getInstance()
- .getTypes()
- .entrySet())
- {
-
- MediaTypeConfiguration value = entry.getValue();
-
- List<String> extensionsList = value.getExtensionsList();
-
- if (extensionsList != null && extensionsList.contains(lowerCasedExtension))
- {
- return entry.getValue();
- }
- }
-
- return null;
- }
-
- /**
- * Get all media type map
- * @return media type map
- */
- public Map<String, MediaTypeConfiguration> getTypes()
- {
- return types;
- }
-
- /**
- * Get the list of web pages where a media is used
- * @param uuid uuid of media
- * @return list of web pages where a media is used
- * @throws InvalidQueryException invalid query
- * @throws RepositoryException repository exception
- */
- public List<String> getUsedInWebPages(String uuid) throws InvalidQueryException, RepositoryException
- {
- return MediaUsedInManager.getInstance().getUsedInWorkspacePaths(uuid, RepositoryConstants.WEBSITE);
- }
-
- // /**
- // * @param path
- // * @param type
- // * @param search
- // * @param recursive
- // * @return
- // * @throws RepositoryException
- // * @deprecated use the find method overload based on Magnolia Criteria API
- // */
- // @Deprecated
- // public Collection<Content> find(String path, String type, String search, boolean recursive)
- // throws RepositoryException
- // {
- // QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
- // StringBuffer sbQuery = new StringBuffer("/jcr:root/");
- // path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
- // if (StringUtils.isNotEmpty(path))
- // {
- // sbQuery.append(ISO9075.encodePath(path)).append('/');
- // }
- // if (recursive)
- // {
- // sbQuery.append('/');
- // }
- // sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
- // List<String> clauses = new ArrayList<String>();
- // if (StringUtils.isNotBlank(search))
- // {
- // clauses.add("jcr:contains(.,'" + StringUtils.replace(search, "'", "''") + "')");
- // }
- // if (StringUtils.isNotBlank(type))
- // {
- // clauses.add("@type='" + type + "'");
- // }
- // if (!clauses.isEmpty())
- // {
- // sbQuery.append('[').append(StringUtils.join(clauses, " and ")).append(']');
- // }
- // if (StringUtils.isNotBlank(search))
- // {
- // sbQuery.append(" order by @jcr:score descending");
- // }
- // Query q = qm.createQuery(new String(sbQuery), Query.XPATH);
- // QueryResult qr = q.execute();
- // return qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
- // }
-
- /**
- * Get the type configuration for a media
- * @param media media
- * @return type configuration
- */
- public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Node media)
- {
- try
- {
- if (!StringUtils.equals(media.getPrimaryNodeType().getName(), MGNL_MEDIA_TYPE))
- {
- return null;
- }
- }
- catch (RepositoryException e)
- {
- log.error("Error getting item type on node {} module media", NodeUtil.getPathIfPossible(media), e);
- return null;
- }
-
- return types.get(PropertyUtil.getString(media, "type"));
- }
-
- /**
- * Get uri mapping for repo
- * @return uri mapping for repo
- */
- public String getURIMappingPrefix()
- {
- Collection<URI2RepositoryMapping> mappings = Components.getComponent(URI2RepositoryManager.class).getMappings();
- for (URI2RepositoryMapping mapping : mappings)
- {
- if (mapping.getRepository().equals(MediaModule.REPO))
- {
- return mapping.getURIPrefix();
- }
- }
- return StringUtils.EMPTY;
- }
+ MediaTypeConfiguration getMediaHandlerFromExtension(String extension);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -16,190 +16,22 @@
* 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.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.jcr.RuntimeRepositoryException;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.objectfactory.Components;
-import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
-import javax.inject.Singleton;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.query.InvalidQueryException;
-
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- * @author dschivo
+ * @author fgiust
* @version $Id$
*/
-@Singleton
-public class MediaUsedInManager extends ObservedManagerAdapter
+public interface MediaUsedInManager
{
- public static MediaUsedInManager getInstance()
- {
- return Components.getComponent(MediaUsedInManager.class);
- }
+ Map<String, AdvancedResult> getUsedIn(String mediaUUID);
- private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
+ AdvancedResult getUsedInWorkspace(String mediaUUID, String workspaceName);
- private Map<String, UsedInWorkspace> usedInWorkspaceMap = new HashMap<String, UsedInWorkspace>();
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void onClear()
- {
- usedInWorkspaceMap.clear();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void onRegister(Node node)
- {
-
- Iterable<Node> uiwNodes;
- try
- {
- uiwNodes = NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE);
- }
- catch (RepositoryException e)
- {
- throw new RuntimeRepositoryException(e);
- }
-
- for (Node uiwNode : uiwNodes)
- {
- try
- {
- UsedInWorkspace uiw = (UsedInWorkspace) NodeUtilsExt.toBean(uiwNode, UsedInWorkspace.class);
- if (StringUtils.isEmpty(uiw.getWorkspaceName()))
- {
- uiw.setWorkspaceName(NodeUtil.getName(uiwNode));
- }
- if (StringUtils.isEmpty(uiw.getNodeType()))
- {
- uiw.setNodeType(MgnlNodeType.NT_CONTENT);
- }
- usedInWorkspaceMap.put(uiw.getWorkspaceName(), uiw);
- }
- catch (Content2BeanException e)
- {
- log.error("Error getting media used-in for {}", NodeUtil.getPathIfPossible(uiwNode), e);
- }
- }
- }
-
- /**
- * @param mediaUUID
- * @return
- * @throws InvalidQueryException
- * @throws RepositoryException
- */
- public Map<String, List<String>> getUsedInPaths(String mediaUUID) throws InvalidQueryException, RepositoryException
- {
- Map<String, List<String>> map = new HashMap<String, List<String>>(usedInWorkspaceMap.size());
- for (String workspaceName : usedInWorkspaceMap.keySet())
- {
- map.put(workspaceName, getUsedInWorkspacePaths(mediaUUID, workspaceName));
- }
- return map;
- }
-
- public List<String> getUsedInWorkspacePaths(String mediaUUID, String workspaceName) throws InvalidQueryException,
- RepositoryException
- {
- UsedInWorkspace uiw = usedInWorkspaceMap.get(workspaceName);
- if (uiw == null)
- {
- if (RepositoryConstants.WEBSITE.equals(workspaceName) && usedInWorkspaceMap.isEmpty())
- {
- // backward compatibility
- uiw = UsedInWorkspace.DEFAULT_WEBSITE;
- }
- else
- {
- return Collections.emptyList();
- }
- }
- List<Node> nodes = getUsedInWorkspaceNodes(mediaUUID, uiw);
- List<String> paths = new ArrayList<String>(nodes.size());
- for (Node node : nodes)
- {
- paths.add(node.getPath());
- }
- return paths;
- }
-
- private static List<Node> getUsedInWorkspaceNodes(String mediaUUID, UsedInWorkspace uiw)
- throws InvalidQueryException, RepositoryException
- {
- List<Node> nodes = new ArrayList<Node>();
- Set<String> handles = new HashSet<String>();
-
- String basepath = "/jcr:root" + StringUtils.defaultString(uiw.getBasePath());
-
- if (!StringUtils.endsWith(basepath, "/"))
- {
- basepath = basepath + "/";
- }
- basepath = basepath + "/*";
-
- Criteria criteria = JCRCriteriaFactory
- .createCriteria()
- .setWorkspace(uiw.getWorkspaceName())
- .setBasePath(basepath)
- .add(Restrictions.contains(uiw.getPropertyName(), mediaUUID))
- .add(Restrictions.not(Restrictions.eq("@jcr:primaryType", "nt:frozenNode")))
- .addOrder(Order.desc("@jcr:score"));
-
- AdvancedResult result = criteria.execute();
-
- log.debug("{} > {}", criteria.toXpathExpression(), result.getTotalSize());
-
- for (Node item : result.getItems())
- {
- while (!StringUtils.equals(item.getPrimaryNodeType().getName(), uiw.getNodeType()) && item.getDepth() > 1)
- {
- item = item.getParent();
- }
-
- if (StringUtils.equals(item.getPrimaryNodeType().getName(), uiw.getNodeType())
- && !handles.contains(item.getPath()))
- {
- nodes.add(item);
- handles.add(item.getPath());
- }
- }
-
- return nodes;
- }
-
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-19 13:13:31 UTC (rev 4387)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-19 20:58:07 UTC (rev 4388)
@@ -19,10 +19,17 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.repository.RepositoryConstants;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* @author dschivo
* @version $Id$
@@ -34,97 +41,72 @@
private String workspaceName;
- private String nodeType = MgnlNodeType.NT_PAGE;
+ private List<String> nodetypes = new ArrayList<String>();
- private String basePath = "/";
+ private String basepath = "/";
- private String propertyName = ".";
+ private List<String> properties = new ArrayList<String>();
- /**
- *
- */
public UsedInWorkspace()
{
}
- /**
- * @param workspaceName
- * @param nodeType
- */
public UsedInWorkspace(String workspaceName)
{
this.workspaceName = workspaceName;
}
- /**
- * Returns...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-19 13:13:38
|
Revision: 4387
http://openutils.svn.sourceforge.net/openutils/?rev=4387&view=rev
Author: fgiust
Date: 2013-10-19 13:13:31 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
update sample templates definition
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.sample-courses.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.sample-main.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.user-report.xml
Added: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml 2013-10-19 13:13:31 UTC (rev 4387)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="lms-sample-courses" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>14225b9d-9078-4e79-ab21-53609e330a51</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/samples-lms/courses.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>LMS sample: courses</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-05T14:04:47.884+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-19T15:04:14.483+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-courses.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml 2013-10-19 13:13:31 UTC (rev 4387)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="lms-sample-userreport" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>cda610ec-48ab-4109-8086-a6400122643c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>freemarker</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/user-report.html</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>LMS sample: user report</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-10-27T16:13:40.663+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-19T15:04:25.614+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample-userreport.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml 2013-10-19 13:13:31 UTC (rev 4387)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="lms-sample" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>785f8f98-a7ce-406f-ab54-dfd2c21073e9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/samples-lms/index.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>LMS sample: main page</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-05T14:04:47.884+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-19T15:04:06.353+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.pages.lms-sample.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.sample-courses.xml
===================================================================
(Binary files differ)
Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.sample-main.xml
===================================================================
(Binary files differ)
Deleted: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/config.modules.lms.templates.user-report.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 12:13:53
|
Revision: 4386
http://openutils.svn.sourceforge.net/openutils/?rev=4386&view=rev
Author: fgiust
Date: 2013-10-19 12:13:50 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
samples, work in progress
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.css
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/js/bootstrap.js
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/js/bootstrap.min.js
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-ftl.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-jsp.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.css
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-theme.min.css
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.eot
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.svg
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.ttf
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/fonts/glyphicons-halflings-regular.woff
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/js/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-responsive.css
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-responsive.min.css
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/img/
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/js/
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java 2013-10-19 12:13:16 UTC (rev 4385)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java 2013-10-19 12:13:50 UTC (rev 4386)
@@ -19,9 +19,25 @@
package it.openutils.mgnlutils.setup;
+import info.magnolia.cms.core.Path;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractTask;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.module.files.FileExtractionLogger;
+import info.magnolia.module.files.FileExtractor;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
+import info.magnolia.objectfactory.Components;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+
/**
* @author fgiust
* @version $Id$
@@ -29,4 +45,74 @@
public class MgnlUtilsModuleVersionHandler extends DefaultModuleVersionHandler
{
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected List<Task> getStartupTasks(InstallContext installContext)
+ {
+ List<Task> tasks = new ArrayList<Task>();
+
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.bootstrap.samples"))
+ {
+ tasks.add(new FilesExtractionTask());
+ }
+
+ return tasks;
+ }
+
+ public static class FilesExtractionTask extends AbstractTask
+ {
+
+ public FilesExtractionTask()
+ {
+ super("Files extraction", "Extracts files to webapp root.");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(final InstallContext ctx) throws TaskExecutionException
+ {
+ final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
+ {
+
+ public void error(String message)
+ {
+ ctx.warn(message);
+ }
+ }, ctx.getConfigHierarchyManager());
+ try
+ {
+ extractor.extractFiles(new FileExtractor.Transformer()
+ {
+
+ public String accept(String resourcePath)
+ {
+ if (!FilesExtractionTask.this.accept(resourcePath))
+ {
+ return null;
+ }
+ final String relTargetPath = StringUtils.removeStart(resourcePath, "/mgnl-files/");
+ return Path.getAbsoluteFileSystemPath(relTargetPath);
+ }
+
+ });
+ }
+ catch (IOException e)
+ {
+ throw new TaskExecutionException("Could not extract files for module "
+ + ctx.getCurrentModuleDefinition()
+ + ": "
+ + e.getMessage(), e);
+ }
+ }
+
+ protected boolean accept(String resource)
+ {
+ return StringUtils.contains(resource, "/samples/sample-magnoliautils");
+ }
+ }
+
}
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-ftl.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-ftl.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-ftl.xml 2013-10-19 12:13:50 UTC (rev 4386)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-magnoliautils-ftl" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>952478d8-67d5-4f76-b126-19c06bf2b2de</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>info.magnolia.module.samples.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>freemarker</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/samples-utils/sample-magnoliautils.ftl</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Sample Magnoliautils (freemarker)</sv:value>
+ </sv:property>
+ <sv:property sv:name="titleSize" sv:type="String">
+ <sv:value>1</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T22:49:40.002+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parameters">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>684b9f09-f89c-4e23-b2cb-a3a1de697c01</sv:value>
+ </sv:property>
+ <sv:property sv:name="dummy" sv:type="String">
+ <sv:value>This parameter has been set in the template definition</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T22:49:23.238+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-ftl.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-jsp.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-jsp.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-jsp.xml 2013-10-19 12:13:50 UTC (rev 4386)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-magnoliautils-jsp" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2ec97963-d0ab-4e59-87cd-7ceefc0fc59d</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>info.magnolia.module.samples.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/samples/sample-magnoliautils.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Sample Magnoliautils (jsp)</sv:value>
+ </sv:property>
+ <sv:property sv:name="titleSize" sv:type="String">
+ <sv:value>1</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T22:49:10.765+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parameters">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>33f0a097-9df7-4dc9-a328-0a92ee3a0e7d</sv:value>
+ </sv:property>
+ <sv:property sv:name="dummy" sv:type="String">
+ <sv:value>This parameter has been set in the template definition</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T22:48:19.950+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/config.modules.mgnlutils.templates.pages.sample-magnoliautils-jsp.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml 2013-10-19 12:13:50 UTC (rev 4386)
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-magnoliautils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>9854e9ac-0cde-4a3a-b019-e95a8634207c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Magnolia Utils</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T23:33:04.789+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>mgnlutils:pages/sample-magnoliautils-jsp</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="sample1">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ce2e0ee4-97bc-4a28-ab36-9283dd39af2e</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Magnolia Utils Test page 1</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T23:33:13.055+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>mgnlutils:pages/sample-magnoliautils-ftl</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="newcontent">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7766ee9e-bcbe-4f8f-951f-07a57823f03c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:11:22.602+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ef4fe54e-a6f9-4ab6-980a-2395a4a6e194</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value><p><strong>Lorem Ipsum</strong> is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever si</p></sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Paragraph test</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>samplesHowToJSP</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="text_files">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7c158483-8813-47b5-b176-643694dbc857</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="sample1b">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f064acbd-0eb1-44f8-b2a4-f561dd49c805</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Magnolia Utils Test page 1b</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T23:33:25.686+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>mgnlutils:pages/sample-magnoliautils-jsp</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="sample2">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e1285f01-769e-4791-b9de-afcb8771fdc8</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Magnolia Utils Test page 2</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-13T23:33:17.839+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>mgnlutils:pages/sample-magnoliautils-jsp</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp 2013-10-19 12:13:50 UTC (rev 4386)
@@ -0,0 +1,355 @@
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+ xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+<![CDATA[
+<!DOCTYPE html>
+]]>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title> ${content.title}
+ </title>
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+ <style>
+ <![CDATA[
+ code { display: block}
+ ]]>
+ </style>
+ <cms:init />
+ </head>
+ <body>
+ <div id="main" class="container">
+ <div id="header">
+ <h1>Magnolia Utils Samples</h1>
+ </div>
+ <c:set var="oldcontent" value="${state.currentContent}" />
+ <c:set var="contentMap" value="${content}" />
+ <c:set var="node" value="${oldcontent.JCRNode}" />
+ <table class="table table-striped table-bordered table-hover">
+ <thead>
+ <tr>
+ <th>Property</th>
+ <th>Node</th>
+ <th>ContentMap</th>
+ <th>Content</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th><!-- -->
+ </th>
+ <td>${node}
+ </td>
+ <td>${contentMap}
+ </td>
+ <td>${oldcontent}
+ </td>
+ </tr>
+ <tr>
+ <th>class
+ </th>
+ <td>${node.class.name}
+ </td>
+ <td>${contentMap.class.name }
+ </td>
+ <td>${oldcontent.class.name}
+ </td>
+ </tr>
+ <tr>
+ <th>UUID
+ </th>
+ <td>${node.UUID}
+ </td>
+ <td>${contentMap.UUID}
+ </td>
+ <td>${oldcontent.UUID}
+ </td>
+ </tr>
+ <tr>
+ <th>@uuid
+ </th>
+ <td>${node['@uuid']}
+ </td>
+ <td>${contentMap['@uuid']}
+ </td>
+ <td>${oldcontent['@uuid']}
+ </td>
+ </tr>
+ <tr>
+ <th>@UUID
+ </th>
+ <td>${node['@UUID']}
+ </td>
+ <td>${contentMap['@UUID']}
+ </td>
+ <td>${oldcontent['@UUID']}
+ </td>
+ </tr>
+ <tr>
+ <th>@id
+ </th>
+ <td>${node['@id']}
+ </td>
+ <td>${contentMap['@id']}
+ </td>
+ <td>${oldcontent['@id']}
+ </td>
+ </tr>
+ <tr>
+ <th>handle
+ </th>
+ <td>${node.handle}
+ </td>
+ <td>${contentMap.handle}
+ </td>
+ <td>${oldcontent.handle}
+ </td>
+ </tr>
+ <tr>
+ <th>path
+ </th>
+ <td>${node.path}
+ </td>
+ <td>${contentMap.path}
+ </td>
+ <td>${oldcontent.path}
+ </td>
+ </tr>
+ <tr>
+ <th>@handle
+ </th>
+ <td>${node['@handle']}
+ </td>
+ <td>${contentMap['@handle']}
+ </td>
+ <td>${oldcontent['@handle']}
+ </td>
+ </tr>
+ <tr>
+ <th>@path
+ </th>
+ <td>${node['@path']}
+ </td>
+ <td>${contentMap['@path']}
+ </td>
+ <td>${oldcontent['@path']}
+ </td>
+ </tr>
+ <tr>
+ <th>@depth
+ </th>
+ <td>${node['@depth']}
+ </td>
+ <td>${contentMap['@depth']}
+ </td>
+ <td>${oldcontent['@depth']}
+ </td>
+ </tr>
+ <tr>
+ <th>@level
+ </th>
+ <td>${node['@level']}
+ </td>
+ <td>${contentMap['@level']}
+ </td>
+ <td>${oldcontent['@level']}
+ </td>
+ </tr>
+ <tr>
+ <th>level
+ </th>
+ <td>${node.level}
+ </td>
+ <td>${contentMap.level}
+ </td>
+ <td>${oldcontent.level}
+ </td>
+ </tr>
+ <tr>
+ <th>title
+ </th>
+ <td>${node.title}
+ </td>
+ <td>${contentMap.title}
+ </td>
+ <td>${oldcontent.title}
+ </td>
+ </tr>
+ <tr>
+ <th>@name
+ </th>
+ <td>${node['@name']}
+ </td>
+ <td>${contentMap['@name']}
+ </td>
+ <td>${oldcontent['@name']}
+ </td>
+ </tr>
+ <tr>
+ <th>name
+ </th>
+ <td>${node.name}
+ </td>
+ <td>${contentMap.name}
+ </td>
+ <td>${oldcontent.name}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <!-- Variable titleSize is set in the template definition, if empty sets it to 1 -->
+ <!--
+ <cms:contentNodeIterator contentNodeCollectionName="newcontent">
+ <cms:includeTemplate />
+ </cms:contentNodeIterator>
+ <cms:newBar contentNodeCollectionName="newcontent" paragraph="samplesHowToJSP" />
+ -->
+ <div class="well">
+ <h2>firstPageWithCollection</h2>
+ <p>Test if exists a parent page with content in the collectionName given as parameter, if exist set the parent
+ page as actpage
+ </p>
+ <pre class="prettyprint">
+ <code>firstPageWithCollection("newcontent")</code>
+ <code class="text-success">${mu:firstPageWithCollection("newcontent")}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>isPage</h2>
+ <p>Evaluete if primary node type of the associated Node of an object is a mgnl:contentNode</p>
+ <pre class="prettyprint">
+ <code>isPage(actpage)</code>
+ <code class="text-success">${mu:isPage(actpage)}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>getPage</h2>
+ <p>Return the object passed or the first parent page that has content type = mgnl:content</p>
+ <pre class="prettyprint">
+ <code>getPage(actpage))</code>
+ <code class="text-success">${mu:getPage(actpage)}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>requestAttributeMap</h2>
+ <p>Return a map key=value of all magnolia request attributes</p>
+ <pre class="prettyprint">
+ <code>requestAttributeMap()["javax.servlet.forward.request_uri"]</code>
+ <code class="text-success">${mu:requestAttributeMap()["javax.servlet.forward.request_uri"]}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>countNodesInCollection</h2>
+ <p>Count the nodes in a collection with a given content and the name of the collection</p>
+ <pre class="prettyprint">
+ <code>countNodesInCollection(actpage,"newcontent")</code>
+ <code class="text-success">${mu:countNodesInCollection(actpage,"newcontent")}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>countSubpages</h2>
+ <p>Count subpages with a given content</p>
+ <pre class="prettyprint">
+ <code>countSubpages(actpage)</code>
+ <code class="text-success">${mu:countSubpages(actpage)}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>subpages</h2>
+ <p>Return the collection of subpages of a given page</p>
+ <pre class="prettyprint">
+ <code>subpages(actpage)</code>
+ <code class="text-success">${mu:subpages(actpage)}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>user</h2>
+ <p>Return the current user logged</p>
+ <pre class="prettyprint">
+ <code>user()</code>
+ <code class="text-success">${mu:user()}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>develop</h2>
+ <p>Test the system property 'magnolia.develop'</p>
+ <pre class="prettyprint">
+ <code>develop()</code>
+ <code class="text-success">${mu:develop()}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>userInRole</h2>
+ <p>Return true if the current user has a given role</p>
+ <pre class="prettyprint">
+ <code>userInRole("superuser")</code>
+ <code class="text-success">${mu:userInRole("superuser")}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>ctx</h2>
+ <p>Get the current context of this thread.</p>
+ <pre class="prettyprint">
+ <code>ctx()</code>
+ <code class="text-success">${mu:ctx()}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>contentByPath</h2>
+ <p>Return the content of a given path and repository</p>
+ <pre class="prettyprint">
+ <code>contentByPath('Magnolia-Utils','website')</code>
+ <code class="text-success">${mu:contentByPath('Magnolia-Utils','website')}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>contentByPath</h2>
+ <p>Return the content of a given path and repository</p>
+ <pre class="prettyprint">
+ <code>contentByPath('Magnolia-Utils','website')</code>
+ <code class="text-success">${mu:contentByPath('Magnolia-Utils','website')}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>encodeISO9075</h2>
+ <p>encode handle for a JackRabbit search</p>
+ <pre class="prettyprint">
+ <code>encodeISO9075('Magnolia$Utils')</code>
+ <code class="text-success">${mu:encodeISO9075('Magnolia$Utils')}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>isStringInSeparatedList</h2>
+ <p> splits the first argument based on the third (regex) argument and checks if the second argument is present
+ in the resulting array
+ </p>
+ <pre class="prettyprint">
+ <code>mu:isStringInSeparatedList('xAxBxC', 'B', '[A|B]x')</code>
+ <code class="text-success">${mu:isStringInSeparatedList('xAxBxC', 'B', '[A|B]x')}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>isLine</h2>
+ <p> check if the second argument string equals one line of the first argument string, same as
+ isStringInSeparatedList with third argument "\n"
+ </p>
+ <pre class="prettyprint">
+ <code>mu:isLine('test', 'prova')</code>
+ <code class="text-success">${mu:isLine('test', 'prova')}</code>
+ </pre>
+ </div>
+ <div class="well">
+ <h2>getValidatedLabel</h2>
+ <p>Retrieve validate label for input string</p>
+ <pre class="prettyprint">
+ <code>mu:getValidatedLabel('validlabel!test')</code>
+ <code class="text-success">${mu:getValidatedLabel('validlabel!test')}</code>
+ </pre>
+ </div>
+ </div>
+ </body>
+ </html>
+</jsp:root>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-responsive.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/css/bootstrap-responsive.css 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/bootstrap/3.0/css/bootstrap-responsive.css 2013-10-19 12:13:50 UTC (rev 4386)
@@ -1,1109 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
- *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
- display: table;
- line-height: 0;
- content: "";
-}
-
-.clearfix:after {
- clear: both;
-}
-
-.hide-text {
- font: 0/0 a;
- color: transparent;
- text-shadow: none;
- background-color: transparent;
- border: 0;
-}
-
-.input-block-level {
- display: block;
- width: 100%;
- min-height: 30px;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-@-ms-viewport {
- width: device-width;
-}
-
-.hidden {
- display: none;
- visibility: hidden;
-}
-
-.visible-phone {
- display: none !important;
-}
-
-.visible-tablet {
- display: none !important;
-}
-
-.hidden-desktop {
- display: none !important;
-}
-
-.visible-desktop {
- display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
- .hidden-desktop {
- display: inherit !important;
- }
- .visible-desktop {
- display: none !important ;
- }
- .visible-tablet {
- display: inherit !important;
- }
- .hidden-tablet {
- display: none !important;
- }
-}
-
-@media (max-width: 767px) {
- .hidden-desktop {
- display: inherit !important;
- }
- .visible-desktop {
- display: none !important;
- }
- .visible-phone {
- display: inherit !important;
- }
- .hidden-phone {
- display: none !important;
- }
-}
-
-.visible-print {
- display: none !important;
-}
-
-@media print {
- .visible-print {
- display: inherit !important;
- }
- .hidden-print {
- display: none !important;
- }
-}
-
-@media (min-width: 1200px) {
- .row {
- margin-left: -30px;
- *zoom: 1;
- }
- .row:before,
- .row:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .row:after {
- clear: both;
- }
- [class*="span"] {
- float: left;
- min-height: 1px;
- margin-left: 30px;
- }
- .container,
- .navbar-static-top .container,
- .navbar-fixed-top .container,
- .navbar-fixed-bottom .container {
- width: 1170px;
- }
- .span12 {
- width: 1170px;
- }
- .span11 {
- width: 1070px;
- }
- .span10 {
- width: 970px;
- }
- .span9 {
- width: 870px;
- }
- .span8 {
- width: 770px;
- }
- .span7 {
- width: 670px;
- }
- .span6 {
- width: 570px;
- }
- .span5 {
- width: 470px;
- }
- .span4 {
- width: 370px;
- }
- .span3 {
- width: 270px;
- }
- .span2 {
- width: 170px;
- }
- .span1 {
- width: 70px;
- }
- .offset12 {
- margin-left: 1230px;
- }
- .offset11 {
- margin-left: 1130px;
- }
- .offset10 {
- margin-left: 1030px;
- }
- .offset9 {
- margin-left: 930px;
- }
- .offset8 {
- margin-left: 830px;
- }
- .offset7 {
- margin-left: 730px;
- }
- .offset6 {
- margin-left: 630px;
- }
- .offset5 {
- margin-left: 530px;
- }
- .offset4 {
- margin-left: 430px;
- }
- .offset3 {
- margin-left: 330px;
- }
- .offset2 {
- margin-left: 230px;
- }
- .offset1 {
- margin-left: 130px;
- }
- .row-fluid {
- width: 100%;
- *zoom: 1;
- }
- .row-fluid:before,
- .row-fluid:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .row-fluid:after {
- clear: both;
- }
- .row-fluid [class*="span"] {
- display: block;
- float: left;
- width: 100%;
- min-height: 30px;
- margin-left: 2.564102564102564%;
- *margin-left: 2.5109110747408616%;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
- .row-fluid [class*="span"]:first-child {
- margin-left: 0;
- }
- .row-fluid .controls-row [class*="span"] + [class*="span"] {
- margin-left: 2.564102564102564%;
- }
- .row-fluid .span12 {
- width: 100%;
- *width: 99.94680851063829%;
- }
- .row-fluid .span11 {
- width: 91.45299145299145%;
- *width: 91.39979996362975%;
- }
- .row-fluid .span10 {
- width: 82.90598290598291%;
- *width: 82.8527914166212%;
- }
- .row-fluid .span9 {
- width: 74.35897435897436%;
- *width: 74.30578286961266%;
- }
- .row-fluid .span8 {
- width: 65.81196581196582%;
- *width: 65.75877432260411%;
- }
- .row-fluid .span7 {
- width: 57.26495726495726%;
- *width: 57.21176577559556%;
- }
- .row-fluid .span6 {
- width: 48.717948717948715%;
- *width: 48.664757228587014%;
- }
- .row-fluid .span5 {
- width: 40.17094017094017%;
- *width: 40.11774868157847%;
- }
- .row-fluid .span4 {
- width: 31.623931623931625%;
- *width: 31.570740134569924%;
- }
- .row-fluid .span3 {
- width: 23.076923076923077%;
- *width: 23.023731587561375%;
- }
- .row-fluid .span2 {
- width: 14.52991452991453%;
- *width: 14.476723040552828%;
- }
- .row-fluid .span1 {
- width: 5.982905982905983%;
- *width: 5.929714493544281%;
- }
- .row-fluid .offset12 {
- margin-left: 105.12820512820512%;
- *margin-left: 105.02182214948171%;
- }
- .row-fluid .offset12:first-child {
- margin-left: 102.56410256410257%;
- *margin-left: 102.45771958537915%;
- }
- .row-fluid .offset11 {
- margin-left: 96.58119658119658%;
- *margin-left: 96.47481360247316%;
- }
- .row-fluid .offset11:first-child {
- margin-left: 94.01709401709402%;
- *margin-left: 93.91071103837061%;
- }
- .row-fluid .offset10 {
- margin-left: 88.03418803418803%;
- *margin-left: 87.92780505546462%;
- }
- .row-fluid .offset10:first-child {
- margin-left: 85.47008547008548%;
- *margin-left: 85.36370249136206%;
- }
- .row-fluid .offset9 {
- margin-left: 79.48717948717949%;
- *margin-left: 79.38079650845607%;
- }
- .row-fluid .offset9:first-child {
- margin-left: 76.92307692307693%;
- *margin-left: 76.81669394435352%;
- }
- .row-fluid .offset8 {
- margin-left: 70.94017094017094%;
- *margin-left: 70.83378796144753%;
- }
- .row-fluid .offset8:first-child {
- margin-left: 68.37606837606839%;
- *margin-left: 68.26968539734497%;
- }
- .row-fluid .offset7 {
- margin-left: 62.393162393162385%;
- *margin-left: 62.28677941443899%;
- }
- .row-fluid .offset7:first-child {
- margin-left: 59.82905982905982%;
- *margin-left: 59.72267685033642%;
- }
- .row-fluid .offset6 {
- margin-left: 53.84615384615384%;
- *margin-left: 53.739770867430444%;
- }
- .row-fluid .offset6:first-child {
- margin-left: 51.28205128205128%;
- *margin-left: 51.175668303327875%;
- }
- .row-fluid .offset5 {
- margin-left: 45.299145299145295%;
- *margin-left: 45.1927623204219%;
- }
- .row-fluid .offset5:first-child {
- margin-left: 42.73504273504273%;
- *margin-left: 42.62865975631933%;
- }
- .row-fluid .offset4 {
- margin-left: 36.75213675213675%;
- *margin-left: 36.645753773413354%;
- }
- .row-fluid .offset4:first-child {
- margin-left: 34.18803418803419%;
- *margin-left: 34.081651209310785%;
- }
- .row-fluid .offset3 {
- margin-left: 28.205128205128204%;
- *margin-left: 28.0987452264048%;
- }
- .row-fluid .offset3:first-child {
- margin-left: 25.641025641025642%;
- *margin-left: 25.53464266230224%;
- }
- .row-fluid .offset2 {
- margin-left: 19.65811965811966%;
- *margin-left: 19.551736679396257%;
- }
- .row-fluid .offset2:first-child {
- margin-left: 17.094017094017094%;
- *margin-left: 16.98763411529369%;
- }
- .row-fluid .offset1 {
- margin-left: 11.11111111111111%;
- *margin-left: 11.004728132387708%;
- }
- .row-fluid .offset1:first-child {
- margin-left: 8.547008547008547%;
- *margin-left: 8.440625568285142%;
- }
- input,
- textarea,
- .uneditable-input {
- margin-left: 0;
- }
- .controls-row [class*="span"] + [class*="span"] {
- margin-left: 30px;
- }
- input.span12,
- textarea.span12,
- .uneditable-input.span12 {
- width: 1156px;
- }
- input.span11,
- textarea.span11,
- .uneditable-input.span11 {
- width: 1056px;
- }
- input.span10,
- textarea.span10,
- .uneditable-input.span10 {
- width: 956px;
- }
- input.span9,
- textarea.span9,
- .uneditable-input.span9 {
- width: 856px;
- }
- input.span8,
- textarea.span8,
- .uneditable-input.span8 {
- width: 756px;
- }
- input.span7,
- textarea.span7,
- .uneditable-input.span7 {
- width: 656px;
- }
- input.span6,
- textarea.span6,
- .uneditable-input.span6 {
- width: 556px;
- }
- input.span5,
- textarea.span5,
- .uneditable-input.span5 {
- width: 456px;
- }
- input.span4,
- textarea.span4,
- .uneditable-input.span4 {
- width: 356px;
- }
- input.span3,
- textarea.span3,
- .uneditable-input.span3 {
- width: 256px;
- }
- input.span2,
- textarea.span2,
- .uneditable-input.span2 {
- width: 156px;
- }
- input.span1,
- textarea.span1,
- .uneditable-input.span1 {
- width: 56px;
- }
- .thumbnails {
- margin-left: -30px;
- }
- .thumbnails > li {
- margin-left: 30px;
- }
- .row-fluid .thumbnails {
- margin-left: 0;
- }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
- .row {
- margin-left: -20px;
- *zoom: 1;
- }
- .row:before,
- .row:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .row:after {
- clear: both;
- }
- [class*="span"] {
- float: left;
- min-height: 1px;
- margin-left: 20px;
- }
- .container,
- .navbar-static-top .container,
- .navbar-fixed-top .container,
- .navbar-fixed-bottom .container {
- width: 724px;
- }
- .span12 {
- width: 724px;
- }
- .span11 {
- width: 662px;
- }
- .span10 {
- width: 600px;
- }
- .span9 {
- width: 538px;
- }
- .span8 {
- width: 476px;
- }
- .span7 {
- width: 414px;
- }
- .span6 {
- width: 352px;
- }
- .span5 {
- width: 290px;
- }
- .span4 {
- width: 228px;
- }
- .span3 {
- width: 166px;
- }
- .span2 {
- width: 104px;
- }
- .span1 {
- width: 42px;
- }
- .offset12 {
- margin-left: 764px;
- }
- .offset11 {
- margin-left: 702px;
- }
- .offset10 {
- margin-left: 640px;
- }
- .offset9 {
- margin-left: 578px;
- }
- .offset8 {
- margin-left: 516px;
- }
- .offset7 {
- margin-left: 454px;
- }
- .offset6 {
- margin-left: 392px;
- }
- .offset5 {
- margin-left: 330px;
- }
- .offset4 {
- margin-left: 268px;
- }
- .offset3 {
- margin-left: 206px;
- }
- .offset2 {
- margin-left: 144px;
- }
- .offset1 {
- margin-left: 82px;
- }
- .row-fluid {
- width: 100%;
- *zoom: 1;
- }
- .row-fluid:before,
- .row-fluid:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .row-fluid:after {
- clear: both;
- }
- .row-fluid [class*="span"] {
- display: block;
- float: left;
- width: 100%;
- min-height: 30px;
- margin-left: 2.7624309392265194%;
- *margin-left: 2.709239449864817%;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
- .row-fluid [class*="span"]:first-child {
- margin-left: 0;
- }
- .row-fluid .controls-row [class*="span"] + [class*="span"] {
- margin-left: 2.7624309392265194%;
- }
- .row-fluid .span12 {
- width: 100%;
- *width: 99.94680851063829%;
- }
- .row-fluid .span11 {
- width: 91.43646408839778%;
- *width: 91.38327259903608%;
- }
- .row-fluid .span10 {
- width: 82.87292817679558%;
- *width: 82.81973668743387%;
- }
- .row-fluid .span9 {
- width: 74.30939226519337%;
- *width: 74.25620077583166%;
- }
- .row-fluid .span8 {
- width: 65.74585635359117%;
- *width: 65.69266486422946%;
- }
- .row-fluid .span7 {
- width: 57.18232044198895%;
- *width: 57.12912895262725%;
- }
- .row-fluid .span6 {
- width: 48.61878453038674%;
- *width: 48.56559304102504%;
- }
- .row-fluid .span5 {
- width: 40.05524861878453%;
- *width: 40.00205712942283%;
- }
- .row-fluid .span4 {
- width: 31.491712707182323%;
- *width: 31.43852121782062%;
- }
- .row-fluid .span3 {
- width: 22.92817679558011%;
- *width: 22.87498530621841%;
- }
- .row-fluid .span2 {
- width: 14.3646408839779%;
- *width: 14.311449394616199%;
- }
- .row-fluid .span1 {
- width: 5.801104972375691%;
- *width: 5.747913483013988%;
- }
- .row-fluid .offset12 {
- margin-left: 105.52486187845304%;
- *margin-left: 105.41847889972962%;
- }
- .row-fluid .offset12:first-child {
- margin-left: 102.76243093922652%;
- *margin-left: 102.6560479605031%;
- }
- .row-fluid .offset11 {
- margin-left: 96.96132596685082%;
- *margin-left: 96.8549429881274%;
- }
- .row-fluid .offset11:first-child {
- margin-left: 94.1988950276243%;
- *margin-left: 94.09251204890089%;
- }
- .row-fluid .offset10 {
- margin-left: 88.39779005524862%;
- *margin-left: 88.2914070765252%;
- }
- .row-fluid .offset10:first-child {
- margin-left: 85.6353591160221%;
- *margin-left: 85.52897613729868%;
- }
- .row-fluid .offset9 {
- margin-left: 79.8342541436464%;
- *margin-left: 79.72787116492299%;
- }
- .row-fluid .offset9:first-child {
- margin-left: 77.07182320441989%;
- *margin-left: 76.96544022569647%;
- }
- .row-fluid .offset8 {
- margin-left: 71.2707182320442%;
- *margin-left: 71.16433525332079%;
- }
- .row-fluid .offset8:first-child {
- margin-left: 68.50828729281768%;
- *margin-left: 68.40190431409427%;
- }
- .row-fluid .offset7 {
- margin-left: 62.70718232044199%;
- *margin-left: 62.600799341718584%;
- }
- .row-fluid .offset7:first-child {
- margin-left: 59.94475138121547%;
- *margin-left: 59.838368402492065%;
- }
- .row-fluid .offset6 {
- margin-left: 54.14364640883978%;
- *margin-left: 54.037263430116376%;
- }
- .row-fluid .offset6:first-child {
- margin-left: 51.38121546961326%;
- *margin-left: 51.27483249088986%;
- }
- .row-fluid .offset5 {
- margin-left: 45.58011049723757%;
- *margin-left: 45.47372751851417%;
- }
- .row-fluid .offset5:first-child {
- margin-left: 42.81767955801105%;
- *margin-left: 42.71129657928765%;
- }
- .row-fluid .offset4 {
- margin-left: 37.01657458563536%;
- *margin-left: 36.91019160691196%;
- }
- .row-fluid .offset4:first-child {
- margin-left: 34.25414364640884%;
- *margin-left: 34.14776066768544%;
- }
- .row-fluid .offset3 {
- margin-left: 28.45303867403315%;
- *margin-left: 28.346655695309746%;
- }
- .row-fluid .offset3:first-child {
- margin-left: 25.69060773480663%;
- *margin-left: 25.584224756083227%;
- }
- .row-fluid .offset2 {
- margin-left: 19.88950276243094%;
- *margin-left: 19.783119783707537%;
- }
- .row-fluid .offset2:first-child {
- margin-left: 17.12707182320442%;
- *margin-left: 17.02068884448102%;
- }
- .row-fluid .offset1 {
- margin-left: 11.32596685082873%;
- *margin-left: 11.219583872105325%;
- }
- .row-fluid .offset1:first-child {
- margin-left: 8.56353591160221%;
- *margin-left: 8.457152932878806%;
- }
- input,
- textarea,
- .uneditable-input {
- margin-left: 0;
- }
- .controls-row [class*="span"] + [class*="span"] {
- margin-left: 20px;
- }
- input.span12,
- textarea.span12,
- .uneditable-input.span12 {
- width: 710px;
- }
- input.span11,
- textarea.span11,
- .uneditable-input.span11 {
- width: 648px;
- }
- input.span10,
- textarea.span10,
- .uneditable-input.span10 {
- width: 586px;
- }
- input.span9,
- textarea.span9,
- .uneditable-input.span9 {
- width: 524px;
- }
- input.span8,
- textarea.span8,
- .uneditable-input.span8 {
- width: 462px;
- }
- input.span7,
- textarea.span7,
- .uneditable-input.span7 {
- width: 400px;
- }
- input.span6,
- textarea.span6,
- .uneditable-input.span6 {
- width: 338px;
- }
- input.span5,
- textarea.span5,
- .uneditable-input.span5 {
- width: 276px;
- }
- input.span4,
- textarea.span4,
- .uneditable-input.span4 {
- width: 214px;
- }
- input.span3,
- textarea.span3,
- .uneditable-input.span3 {
- width: 152px;
- }
- input.span2,
- textarea.span2,
- .uneditable-input.span2 {
- width: 90px;
- }
- input.span1,
- textarea.span1,
- .uneditable-input.span1 {
- width: 28px;
- }
-}
-
-@media (max-width: 767px) {
- body {
- padding-right: 20px;
- padding-left: 20px;
- }
- .navbar-fixed-top,
- .navbar-fixed-bottom,
- .navbar-static-top {
- margin-right: -20px;
- margin-left: -20px;
- }
- .container-fluid {
- padding: 0;
- }
- .dl-horizontal dt {
- float: none;
- width: auto;
- clear: none;
- text-align: left;
- }
- .dl-horizontal dd {
- margin-left: 0;
- }
- .container {
- width: auto;
- }
- .row-fluid {
- width: 100%;
- }
- .row,
- .thumbnails {
- margin-left: 0;
- }
- .thumbnails > li {
- float: none;
- margin-left: 0;
- }
- [class*="span"],
- .uneditable-input[class*="span"],
- .row-fluid [class*="span"] {
- display: block;
- float: none;
- width: 100%;
- margin-left: 0;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
- .span12,
- .row-fluid .span12 {
- width: 100%;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
- .row-fluid ...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-19 12:13:19
|
Revision: 4385
http://openutils.svn.sourceforge.net/openutils/?rev=4385&view=rev
Author: fgiust
Date: 2013-10-19 12:13:16 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
ignores
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-stripes/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-struts11/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-tagcloud/
Property Changed:
----------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/
magnoliamodules/trunk/magnolia5-test-webapp/
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp 2013-10-19 12:13:16 UTC (rev 4385)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+samples
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml 2013-10-19 12:13:16 UTC (rev 4385)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesMagnoliaUtils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>da5823f7-dac4-4a6f-a769-a09e95601f44</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>info.magnolia.module.samples.messages</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Sample Magnoliautils</sv:value>
- </sv:property>
- <sv:property sv:name="titleSize" sv:type="String">
- <sv:value>1</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:46:42.181+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="parameters">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>6dba0719-7b5c-4991-9eeb-4193a0b8b6db</sv:value>
- </sv:property>
- <sv:property sv:name="dummy" sv:type="String">
- <sv:value>This parameter has been set in the template definition</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:46:04.237+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-19 12:13:16 UTC (rev 4385)
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="Magnolia-Utils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>9854e9ac-0cde-4a3a-b019-e95a8634207c</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:47:38.973+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="Magnolia-Utils">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>ce2e0ee4-97bc-4a28-ab36-9283dd39af2e</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils Test page 1</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:47:41.964+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="Magnolia-Utils0">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>f064acbd-0eb1-44f8-b2a4-f561dd49c805</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils Test page 1b</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:48:00.030+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="newcontent">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7766ee9e-bcbe-4f8f-951f-07a57823f03c</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.602+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="0">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>ef4fe54e-a6f9-4ab6-980a-2395a4a6e194</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="text" sv:type="String">
- <sv:value><p><strong>Lorem Ipsum</strong> is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever si</p></sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Paragraph test</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesHowToJSP</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7c158483-8813-47b5-b176-643694dbc857</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
- <sv:node sv:name="Magnolia-Utils-page2">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>e1285f01-769e-4791-b9de-afcb8771fdc8</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils Test page 2</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:47:48.730+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Index: magnoliamodules/trunk/magnolia5-test-webapp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia5-test-webapp 2013-10-19 12:13:16 UTC (rev 4385)
Property changes on: magnoliamodules/trunk/magnolia5-test-webapp
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4384
http://openutils.svn.sourceforge.net/openutils/?rev=4384&view=rev
Author: fgiust
Date: 2013-10-19 12:11:24 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
fix imports
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-10-19 12:10:45 UTC (rev 4383)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-10-19 12:11:24 UTC (rev 4384)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmessages.pages;
-import info.magnolia.cms.core.MetaData;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
@@ -52,9 +51,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.xml.internal.ws.util.MetadataUtil;
-
/**
* @author manuel
* @version $Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 12:10:50
|
Revision: 4383
http://openutils.svn.sourceforge.net/openutils/?rev=4383&view=rev
Author: fgiust
Date: 2013-10-19 12:10:45 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
upgrade parent pom (maven 3.1 and java 6 required)
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-elfunctions/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-parent/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4web/pom.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
@@ -82,9 +82,14 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-dms</artifactId>
- <version>1.6</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-scheduler</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.11</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-mgnlstruts11</artifactId>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-bshd5/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-dbmigration/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-dbmigration</artifactId>
<name>openutils dbmigration</name>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-deployment/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-elfunctions/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-log4j/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -6,7 +6,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-log4j</artifactId>
<packaging>jar</packaging>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-maven-skin/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-maven-skin</artifactId>
<packaging>jar</packaging>
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-parent/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -137,7 +138,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -145,6 +146,10 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-spring/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-spring</artifactId>
<name>openutils spring tools</name>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing</artifactId>
<name>Openutils testing library</name>
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing-junit/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>Openutils testing library (JUnit)</name>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing-testng/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>Openutils testing library (TestNG)</name>
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing4dwr/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing4dwr</artifactId>
<name>openutils dwr test utils</name>
Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing4dwr-junit</artifactId>
<name>openutils testing4dwr (junit)</name>
Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing4dwr-testng/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing4dwr-testng</artifactId>
<name>openutils testing4dwr (testng)</name>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
+++ trunk/openutils-testing4web/pom.xml 2013-10-19 12:10:45 UTC (rev 4383)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.13</version>
+ <version>1.14</version>
</parent>
<artifactId>openutils-testing4web</artifactId>
<name>Openutils testing4web</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 09:35:12
|
Revision: 4382
http://openutils.svn.sourceforge.net/openutils/?rev=4382&view=rev
Author: fgiust
Date: 2013-10-19 09:35:09 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-10-19 09:35:03 UTC (rev 4381)
+++ trunk/openutils-parent/pom.xml 2013-10-19 09:35:09 UTC (rev 4382)
@@ -4,14 +4,14 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<packaging>pom</packaging>
- <version>1.14</version>
+ <version>1.15-SNAPSHOT</version>
<name>openutils</name>
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.14</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.14</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-parent-1.14</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
</scm>
<issueManagement>
<system>jira</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 09:35:06
|
Revision: 4381
http://openutils.svn.sourceforge.net/openutils/?rev=4381&view=rev
Author: fgiust
Date: 2013-10-19 09:35:03 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-parent-1.14
Added Paths:
-----------
tags/openutils-parent-1.14/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 09:34:55
|
Revision: 4380
http://openutils.svn.sourceforge.net/openutils/?rev=4380&view=rev
Author: fgiust
Date: 2013-10-19 09:34:51 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-parent-1.14
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-10-19 09:31:15 UTC (rev 4379)
+++ trunk/openutils-parent/pom.xml 2013-10-19 09:34:51 UTC (rev 4380)
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<packaging>pom</packaging>
- <version>1.14-SNAPSHOT</version>
+ <version>1.14</version>
<name>openutils</name>
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.14</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.14</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-parent-1.14</url>
</scm>
<issueManagement>
<system>jira</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 09:31:20
|
Revision: 4379
http://openutils.svn.sourceforge.net/openutils/?rev=4379&view=rev
Author: fgiust
Date: 2013-10-19 09:31:15 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
update maven version, plugins, and requirements to java6
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2013-10-14 08:14:15 UTC (rev 4378)
+++ trunk/openutils-parent/pom.xml 2013-10-19 09:31:15 UTC (rev 4379)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -27,7 +28,7 @@
</license>
</licenses>
<prerequisites>
- <maven>3.0.0</maven>
+ <maven>3.1.0</maven>
</prerequisites>
<developers>
<developer>
@@ -105,7 +106,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -113,14 +114,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
+ <version>3.3</version>
<configuration>
<stagingSiteURL>scp://shell.sourceforge.net/home/frs/project/o/op/openutils/htdocs/staging/${project.artifactId}/</stagingSiteURL>
</configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.4.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>install</preparationGoals>
@@ -130,7 +131,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.16</version>
<configuration>
<useManifestOnlyJar>false</useManifestOnlyJar>
</configuration>
@@ -139,14 +140,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -158,7 +159,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
+ <version>2.8.1</version>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -172,7 +173,7 @@
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
- <version>1.5.0</version>
+ <version>1.9.0</version>
<configuration>
<header>src/main/etc/header.txt</header>
<includes>
@@ -195,7 +196,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<executions>
<execution>
<id>bundle</id>
@@ -214,7 +215,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
<configuration>
<encoding>UTF-8</encoding>
<quiet>true</quiet>
@@ -227,7 +228,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-6</version>
+ <version>2.5</version>
</extension>
</extensions>
</build>
@@ -235,7 +236,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
<configuration>
<encoding>UTF-8</encoding>
<quiet>true</quiet>
@@ -244,11 +245,11 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
+ <version>2.7</version>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.3</version>
+ <version>2.7</version>
<reportSets>
<reportSet>
<reports>
@@ -259,15 +260,15 @@
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.16</version>
</plugin>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</plugin>
</plugins>
</reporting>
@@ -322,17 +323,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.5</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -373,7 +374,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -388,4 +389,7 @@
</build>
</profile>
</profiles>
-</project>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4378
http://openutils.svn.sourceforge.net/openutils/?rev=4378&view=rev
Author: fgiust
Date: 2013-10-14 08:14:15 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
check for broken nodes while iterating
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-10-13 20:39:28 UTC (rev 4377)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-10-14 08:14:15 UTC (rev 4378)
@@ -80,22 +80,26 @@
do
{
next = super.next();
- try
+ if (next != null) // may happen for broken indexes?
{
- if (!PermissionUtil.isGranted(
- next.getSession().getWorkspace().getName(),
- NodeUtil.getPathIfPossible(next),
- Session.ACTION_READ))
+ try
{
- next = null;
+ if (!PermissionUtil.isGranted(
+ next.getSession().getWorkspace().getName(),
+ NodeUtil.getPathIfPossible(next),
+ Session.ACTION_READ))
+ {
+ next = null;
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
}
- catch (RepositoryException e)
- {
- throw new RuntimeRepositoryException(e);
- }
}
while (next == null && super.hasNext());
+
// return true if a next result exists and it is accessible
return next != null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-13 20:39:32
|
Revision: 4377
http://openutils.svn.sourceforge.net/openutils/?rev=4377&view=rev
Author: fgiust
Date: 2013-10-13 20:39:28 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
migration fixes
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -248,10 +248,29 @@
Integer width = NumberUtils.toInt(PropertyUtil.getString(prop, FileProperties.PROPERTY_WIDTH));
Integer height = NumberUtils.toInt(PropertyUtil.getString(prop, FileProperties.PROPERTY_HEIGHT));
Point size = ImageUtils.parseForSize(resolution);
+
+ boolean isSameSizeAsOriginal = false;
if (width == size.x && height == size.y)
{
- return appendBaseUrl(mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH));
+ isSameSizeAsOriginal = true;
}
+
+ if (!isSameSizeAsOriginal)
+ {
+ char controlchar = StringUtils.lowerCase(resolution).charAt(0);
+ if (controlchar == 'l')
+ {
+ if ((width == size.x && height < size.y) || (width < size.x && height == size.y))
+ {
+ isSameSizeAsOriginal = true;
+ }
+ }
+ }
+
+ if (isSameSizeAsOriginal)
+ {
+ return appendBaseUrl(mcm.getURIMappingPrefix() + NodeUtilsExt.getBinaryPath(prop));
+ }
}
if (!ImageUtils.checkOrCreateResolution(media, resolution, null, module().isLazyResolutionCreation()))
@@ -263,7 +282,7 @@
String resString = "res-" + ImageUtils.getResolutionPath(resolution);
if (resolutions != null && resolutions.hasNode(resString))
{
- String resPath = PropertyUtil.getString(resolutions.getNode(resString), FileProperties.PATH);
+ String resPath = NodeUtilsExt.getBinaryPath(resolutions.getNode(resString));
return appendBaseUrl(mcm.getURIMappingPrefix() + resPath);
@@ -580,10 +599,19 @@
private static String appendBaseUrl(String url)
{
- String baseurl = module().getBaseurl();
- if (baseurl != null && StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
+
+ if (StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
{
- return baseurl + url;
+ if (MgnlContext.isWebContext())
+ {
+ url = StringUtils.defaultString(MgnlContext.getWebContext().getContextPath()) + url;
+ }
+
+ String baseurl = module().getBaseurl();
+ if (baseurl != null)
+ {
+ return baseurl + url;
+ }
}
return url;
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -84,46 +84,34 @@
{
Node data = getOriginalFileNodeData(media);
- try
+
+ if (StringUtils.equalsIgnoreCase(PropertyUtil.getString(data, FileProperties.EXTENSION), "pdf"))
{
- if (NodeUtil.isNodeType(data, NodeType.NT_RESOURCE))
+
+ try
{
+ String filename = PropertyUtil.getString(data, FileProperties.PROPERTY_FILENAME) + ".png";
- if (StringUtils.equalsIgnoreCase(PropertyUtil.getString(data, FileProperties.EXTENSION), "pdf"))
+ InputStream stream = data.getProperty(MgnlNodeType.JCR_DATA).getValue().getBinary().getStream();
+ try
{
-
- try
- {
- String filename = PropertyUtil.getString(data, FileProperties.PROPERTY_FILENAME) + ".png";
-
- InputStream stream = getOriginalFileNodeData(data)
- .getProperty(MgnlNodeType.JCR_DATA)
- .getValue()
- .getBinary()
- .getStream();
- try
- {
- createPdfPreview(media, stream, filename);
- }
- finally
- {
- IOUtils.closeQuietly(stream);
- }
- }
- catch (Throwable e)
- {
- log.warn(
- "Unable to generate a preview for {} due to a {}: {}",
- new Object[]{NodeUtil.getPathIfPossible(media), e.getClass().getName(), e.getMessage() });
- }
+ createPdfPreview(media, stream, filename);
}
-
+ finally
+ {
+ IOUtils.closeQuietly(stream);
+ }
}
+ catch (Throwable e)
+ {
+ log.warn("Unable to generate a preview for "
+ + NodeUtil.getPathIfPossible(media)
+ + " due to a "
+ + e.getClass().getName()
+ + ": "
+ + e.getMessage());
+ }
}
- catch (RepositoryException e)
- {
- // do nothing
- }
return super.onPostSave(media);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -84,7 +84,7 @@
{
try
{
- return media.hasProperty(PREVIEW_NODEDATA_NAME);
+ return media.hasNode(PREVIEW_NODEDATA_NAME);
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-10-13 20:39:28 UTC (rev 4377)
@@ -118,7 +118,7 @@
<c:if test="${empty alt}">
<c:set var="alt" value="${mediaNode.title}" />
</c:if>
- <![CDATA[<img src="${pageContext.request.contextPath}${url}" alt="${alt}" title="${alt}"]]>
+ <![CDATA[<img src="${url}" alt="${alt}" title="${alt}"]]>
<c:if test="${not empty id}">
<![CDATA[ id="${id}"]]>
</c:if>
@@ -199,11 +199,11 @@
</c:choose>
<c:if test="${!empty preview}">
- <c:set var="preview" value="${pageContext.request.contextPath}${preview}" />
+ <c:set var="preview" value="${preview}" />
</c:if>
<media:swfobject
- player="${pageContext.request.contextPath}${media:url(mediaNode)}"
+ player="${media:url(mediaNode)}"
width="${width gt 0 ? width : ''}"
height="${height gt 0? height : ''}"
image="${preview}"
@@ -219,7 +219,7 @@
<![CDATA[<!-- missing media: ${item} -->]]>
</c:when>
<c:when test="${fn:startsWith(item, '/')}">
- <![CDATA[<img src="${pageContext.request.contextPath}${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
+ <![CDATA[<img src="${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
</c:when>
<c:otherwise>
<![CDATA[<!-- missing media: ${item} -->]]>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-10-13 20:39:28 UTC (rev 4377)
@@ -41,7 +41,6 @@
<c:set var="baseUrl" scope="request">
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
- <jsp:text>${pageContext.request.contextPath}</jsp:text>
</c:set>
<c:if test="${empty width or width eq 0 }">
<c:set var="width" value="${media:width(mediaNode)}" />
@@ -68,10 +67,10 @@
<c:choose>
<c:when test="${previewwidth gt 0 and previewheight gt 0}">
<c:set var="previewres" value="${previewwidth}x${previewheight}" />
- <c:set var="preview" value="${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}" />
+ <c:set var="preview" value="${media:urlres(mediaNode, previewres)}" />
</c:when>
<c:otherwise>
- <c:set var="preview" value="${pageContext.request.contextPath}${media:thumbnail(mediaNode)}" />
+ <c:set var="preview" value="${media:thumbnail(mediaNode)}" />
</c:otherwise>
</c:choose>
</c:if>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2013-10-13 20:39:28 UTC (rev 4377)
@@ -13,10 +13,10 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
+ <sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-media/template.jsp</sv:value>
+ <sv:value>/samples-media/template.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>SimpleMedia sample template</sv:value>
@@ -41,7 +41,7 @@
<sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-04-10T10:03:46.018+02:00</sv:value>
+ <sv:value>2013-10-13T21:16:25.602+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="areas">
@@ -90,9 +90,6 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-media/area.jsp</sv:value>
- </sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>list</sv:value>
</sv:property>
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -1,9 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <c:forEach var="component" items="${components}">
- <cms:component content="${component}" />
- </c:forEach>
-</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -2,60 +2,65 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8"
- session="false" />
- <div class="textImage"><c:set var="mediaNode"
- value="${media:node(content.media)}" />
- <div>
- <h3>Original image</h3>
- <div><pre>media:url(mediaNode)</pre> <img
- src="${pageContext.request.contextPath}${media:url(mediaNode)}" /></div>
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <div class="textImage">
+ <c:set var="mediaNode" value="${media:node(content.media)}" />
+ <div>
+ <h3>Original image</h3>
+ <div>
+ <pre>media:url(mediaNode)</pre>
+ <img src="${media:url(mediaNode)}" />
+ </div>
+ </div>
+ <div>
+ <h3>100x100: resize image in order to contain required resolution (100x100) and crop outfitting simmetric bands.
+ Resulting image has the required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, '100x100')</pre>
+ <img src="${media:urlres(mediaNode, '100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>L100x100: resize image in order to fit into required resolution. Resulting image should have one side smaller
+ than required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'l100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'l100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>o100x100: resize image in order to fit into required resolution and fills empty bands with background color
+ (default = White). Resulting image has the required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'o100x100')}" />
+ </div>
+ <div>
+ <p>With background color</p>
+ <pre>media:urlres(mediaNode, 'o100x100;background=FF0000')</pre>
+ <img src="${media:urlres(mediaNode, 'o100x100;background=FF0000')}" />
+ </div>
+ </div>
+ <div>
+ <h3>n100x100: resize image in order to contain the required resolution. Resulting image should have one side
+ bigger than required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'n100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'n100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>Passing parameters: resolution string supports optional parameters that may enable post processing.
+ </h3>
+ <div>
+ <p>Adding parameter bw will make the image in grayscale</p>
+ <pre>media:urlres(mediaNode, 'n100x100;bw')</pre>
+ <img src="${media:urlres(mediaNode, 'n100x100;bw')}" />
+ </div>
+ </div>
</div>
- <div>
- <h3>100x100: resize image in order to contain required resolution
- (100x100) and crop outfitting simmetric bands. Resulting image has the
- required resolution.</h3>
- <div><pre>media:urlres(mediaNode, '100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, '100x100')}" />
- </div>
- </div>
- <div>
- <h3>L100x100: resize image in order to fit into required
- resolution. Resulting image should have one side smaller than required
- resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'l100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'l100x100')}" />
- </div>
- </div>
- <div>
- <h3>o100x100: resize image in order to fit into required
- resolution and fills empty bands with background color (default =
- White). Resulting image has the required resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'o100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o100x100')}" />
- </div>
- <div>
- <p>With background color</p>
- <pre>media:urlres(mediaNode, 'o100x100;background=FF0000')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o100x100;background=FF0000')}" />
- </div>
- </div>
- <div>
- <h3>n100x100: resize image in order to contain the required
- resolution. Resulting image should have one side bigger than required
- resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'n100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100')}" />
- </div>
- </div>
- <div>
- <h3>Passing parameters: resolution string supports optional
- parameters that may enable post processing.</h3>
- <div>
- <p>Adding parameter bw will make the image in grayscale</p>
- <pre>media:urlres(mediaNode, 'n100x100;bw')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100;bw')}" />
- </div>
- </div>
- </div>
</jsp:root>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -1,25 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${content.title}</title>
- <cms:init />
- <link rel="stylesheet" type="text/css"
- href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/media-samples.css" />
- </head>
- <body>
- <div class="container">
- <h1>${content.title}</h1>
- <cms:area name="main" />
- </div>
- </body>
- </html>
-</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl 2013-10-13 20:39:28 UTC (rev 4377)
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>${content.title}</title>
+ [@cms.init /]
+ <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/media-samples.css" />
+ </head>
+ <body>
+ <div class="container">
+ <h1>${content.title}</h1>
+ [@cms.area name="main" /]
+ </div>
+ </body>
+</html>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -211,4 +211,13 @@
// TODO introduce configured wrapping
return node;
}
+
+ public static String getBinaryPath(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-13 19:13:01
|
Revision: 4376
http://openutils.svn.sourceforge.net/openutils/?rev=4376&view=rev
Author: fgiust
Date: 2013-10-13 19:12:57 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
cleanup samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/tagcloud-samples.css
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/samples-tagcloud/
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp 2013-10-13 19:12:41 UTC (rev 4375)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp 2013-10-13 19:12:57 UTC (rev 4376)
@@ -1,50 +1,47 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+ xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud"
+ xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
+ <![CDATA[<!DOCTYPE html> ]]>
</jsp:text>
<html>
<head>
<cms:init />
- <title>${actpage.title}</title>
+ <title>${content.title}</title>
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/tagcloud/samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/tagcloud/samples/css/tagcloud-samples.css" />
</head>
<body>
- <h1>${actpage.title}</h1>
- <h2>Samples:</h2>
- <p>Tagcloud created from scratch, retrieve tags from configured node and set tag url to current page:</p>
- <code>
+ <div class="container">
+ <h1>${content.title}</h1>
+ <h2>Samples:</h2>
+ <p>Tagcloud created from scratch, retrieve tags from configured node and set tag url to current page:</p>
+ <code>
<![CDATA[
<tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
]]>
- </code>
- <p>Produce:</p>
- <tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
- <p>Tagcloud created from scratch, retrieve tags from your configured path (in this sample are /sample-tagcloud/)
- </p>
- <code>
+ </code>
+ <tagcloud:tagcloud id="cloud1" url="${actpage.handle}/" showFreq="true" />
+ <p>Tagcloud created from scratch, retrieve tags from your configured path (in this sample are /sample-tagcloud/)
+ </p>
+ <code>
<![CDATA[
<tagcloud:tagcloud id="cloud2" orderby="count asc" path="/path/to/my/pages" />
]]>
- </code>
- <p>Produce:</p>
- <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/sample-tagcloud/" />
- <p>Retrieve tagcloud where 'tags' is the name</p>
- <code>
+ </code>
+ <tagcloud:tagcloud id="cloud2" orderby="count asc" path="/sample-tagcloud/" />
+ <p>Retrieve tagcloud where 'tags' is the name</p>
+ <code>
<![CDATA[
<tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
]]>
- </code>
- <p>Produce:</p>
- <tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
- <p>A sample where you can add tagcloud control on media dialog and retrieve a media tagcloud</p>
- <code>
- <![CDATA[
- <tagcloud:tagcloud id="cloudMedia" name="tagsMedia" orderby="name asc" showFreq="true">
- ]]>
- </code>
+ </code>
+ <tagcloud:tagcloud id="cloud3" name="tags" orderby="name asc" showFreq="true" />
+ </div>
</body>
</html>
</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/bootstrap.min.css (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/samples/css/bootstrap.min.css 2013-10-13 19:12:57 UTC (rev 4376)
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4375
http://openutils.svn.sourceforge.net/openutils/?rev=4375&view=rev
Author: fgiust
Date: 2013-10-13 19:12:41 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
TAGCLOUD-21 (patch slightly revised)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-10-13 18:56:59 UTC (rev 4374)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java 2013-10-13 19:12:41 UTC (rev 4375)
@@ -21,6 +21,7 @@
import info.magnolia.context.SystemContext;
import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
import info.magnolia.objectfactory.Components;
import java.lang.reflect.InvocationTargetException;
@@ -91,16 +92,21 @@
}
}
- /**
- * Get jcr session
- * @param repository repository
- * @return jcr session
- */
public Session getSession(String repository)
{
+
+ Session session;
try
{
- return Components.getComponent(SystemContext.class).getJCRSession(repository);
+ session = Components.getComponent(SystemContext.class).getJCRSession(repository);
+
+ // TAGCLOUD-21
+ while (session instanceof DelegateSessionWrapper)
+ {
+ session = ((DelegateSessionWrapper) session).getWrappedSession();
+ }
+
+ return session;
}
catch (RepositoryException e)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-13 18:57:04
|
Revision: 4374
http://openutils.svn.sourceforge.net/openutils/?rev=4374&view=rev
Author: fgiust
Date: 2013-10-13 18:56:59 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
cleaned up samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/controls-samples.css
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/paragraph-buttonSet.ftl
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/paragraph-dependentSelectList.ftl
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-buttonSet.jsp
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-buttonSet.xml 2013-10-13 18:56:59 UTC (rev 4374)
@@ -151,9 +151,15 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>Bar</sv:value>
</sv:property>
+ <sv:property sv:name="multiple" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
<sv:property sv:name="optionsProvider" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlcontrols.samples.SampleButtonSetOptionsProvider</sv:value>
</sv:property>
+ <sv:property sv:name="saveHandler" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.MultiValueSaveHandler</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -171,7 +177,7 @@
<sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-07-05T15:56:11.917+02:00</sv:value>
+ <sv:value>2013-10-13T20:43:46.798+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-buttonSet.xml 2013-10-13 18:56:59 UTC (rev 4374)
@@ -19,10 +19,10 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
+ <sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-controls/paragraph-buttonSet.jsp</sv:value>
+ <sv:value>/samples-controls/paragraph-buttonSet.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Button set sample</sv:value>
@@ -44,7 +44,7 @@
<sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-07-05T15:58:37.273+02:00</sv:value>
+ <sv:value>2013-10-13T18:18:32.170+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-dependentSelectList.xml 2013-10-13 18:56:59 UTC (rev 4374)
@@ -19,10 +19,10 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
+ <sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-controls/paragraph-dependentSelectList.jsp</sv:value>
+ <sv:value>/samples-controls/paragraph-dependentSelectList.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Dependent select list sample</sv:value>
@@ -44,7 +44,7 @@
<sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T15:56:31.245+02:00</sv:value>
+ <sv:value>2013-10-13T18:18:30.569+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.pages.sampleControls.xml 2013-10-13 18:56:59 UTC (rev 4374)
@@ -13,10 +13,10 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
+ <sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-controls/template.jsp</sv:value>
+ <sv:value>/samples-controls/template-controls.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Controls sample template</sv:value>
@@ -41,7 +41,7 @@
<sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T11:07:52.810+02:00</sv:value>
+ <sv:value>2013-10-13T18:14:30.307+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="areas">
@@ -90,12 +90,6 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-controls/area.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>list</sv:value>
- </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -113,7 +107,7 @@
<sv:value>2012-03-21T07:30:36.643+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T14:22:47.964+02:00</sv:value>
+ <sv:value>2013-10-13T18:15:58.349+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="availableComponents">
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-10-13 18:56:59 UTC (rev 4374)
@@ -29,7 +29,7 @@
<sv:value>2010-05-11T18:45:03.281+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-07-05T16:09:10.430+02:00</sv:value>
+ <sv:value>2013-10-13T20:56:09.631+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:pages/sampleControls</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2010-05-11T18:55:40.453+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-07-05T16:09:10.430+02:00</sv:value>
+ <sv:value>2013-10-13T20:56:09.631+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -85,15 +85,6 @@
-
-
-
-
-
-
-
-
-
</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
@@ -113,7 +104,7 @@
<sv:value>2010-05-11T18:55:40.468+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-21T17:46:04.175+02:00</sv:value>
+ <sv:value>2013-10-13T20:30:57.796+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:components/samples-grid</sv:value>
@@ -231,12 +222,30 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>496abe2c-4008-4d1b-9bf5-5c6272620c30</sv:value>
</sv:property>
+ <sv:property sv:name="bar" sv:type="String">
+ <sv:value>cd884127-afb5-4e21-9182-55f9a65500cf</sv:value>
+ </sv:property>
<sv:property sv:name="baz" sv:type="String">
- <sv:value/>
+ <sv:value>6d06cd0f-fa48-48c5-93fa-d14d2c59f321</sv:value>
</sv:property>
+ <sv:property sv:name="bazSelect0" sv:type="String">
+ <sv:value>c8a2aa7a-3a5a-4a6c-9b86-10e98da71235</sv:value>
+ </sv:property>
+ <sv:property sv:name="bazSelect1" sv:type="String">
+ <sv:value>b038735c-9351-4083-bc09-5b70576c05e2</sv:value>
+ </sv:property>
<sv:property sv:name="foo" sv:type="String">
- <sv:value/>
+ <sv:value>660a98c5-c342-4b0c-9ac0-04c8283a1b5f</sv:value>
</sv:property>
+ <sv:property sv:name="fooSelect0" sv:type="String">
+ <sv:value>c8a2aa7a-3a5a-4a6c-9b86-10e98da71235</sv:value>
+ </sv:property>
+ <sv:property sv:name="fooSelect1" sv:type="String">
+ <sv:value>5f291d19-cb25-45b2-aaf2-96e6687880b2</sv:value>
+ </sv:property>
+ <sv:property sv:name="fooSelect2" sv:type="String">
+ <sv:value>660a98c5-c342-4b0c-9ac0-04c8283a1b5f</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -254,7 +263,7 @@
<sv:value>2013-06-14T17:42:42.404+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
+ <sv:value>2013-10-13T20:56:09.630+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:components/samples-dependentSelectList</sv:value>
@@ -271,18 +280,26 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>97f05bda-d320-42be-b55a-b8f342e4f498</sv:value>
</sv:property>
+ <sv:property sv:name="bar" sv:type="String" sv:multiple="true">
+ <sv:value>foo</sv:value>
+ <sv:value>baz</sv:value>
+ <sv:value>qux</sv:value>
+ </sv:property>
<sv:property sv:name="baz" sv:type="String">
- <sv:value>false</sv:value>
+ <sv:value>true</sv:value>
</sv:property>
+ <sv:property sv:name="foo" sv:type="String">
+ <sv:value>bar</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
@@ -291,7 +308,7 @@
<sv:value>2013-07-05T16:09:10.429+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-07-05T16:09:10.430+02:00</sv:value>
+ <sv:value>2013-10-13T20:47:27.500+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:components/samples-buttonSet</sv:value>
Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp 2013-10-13 18:56:59 UTC (rev 4374)
@@ -1,9 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <c:forEach var="component" items="${components}">
- <cms:component content="${component}" />
- </c:forEach>
-</jsp:root>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-buttonSet.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-buttonSet.jsp 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-buttonSet.jsp 2013-10-13 18:56:59 UTC (rev 4374)
@@ -1,9 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- ${!empty(content.foo) ? content.foo : '-'}<br />
- ${!empty(content.bar) ? content.bar : '-'}<br />
- ${!empty(content.baz) ? content.baz : '-'}<br />
-</jsp:root>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp 2013-10-13 18:56:59 UTC (rev 4374)
@@ -1,9 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- ${!empty(content.foo) ? cmsfn:contentByIdentifier(content.foo, "config") : '-'}<br />
- ${!empty(content.bar) ? cmsfn:contentByIdentifier(content.bar, "config") : '-'}<br />
- ${!empty(content.baz) ? cmsfn:contentByIdentifier(content.baz, "config") : '-'}<br />
-</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2013-10-13 18:56:59 UTC (rev 4374)
@@ -3,7 +3,7 @@
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <table cellspacing="0" border="1">
+ <table class="table table-bordered">
<thead>
<tr>
<th>text</th>
@@ -18,7 +18,7 @@
</tr>
</thead>
<tbody>
- <c:forEach var="row" items="${mu:splitAndTokenize(content.grid)}">
+ <c:forEach var="row" items="${mu:splitAndTokenize(cmsfn:decode(content).grid)}">
<tr>
<!-- text -->
Deleted: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp 2013-10-13 15:57:34 UTC (rev 4373)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp 2013-10-13 18:56:59 UTC (rev 4374)
@@ -1,21 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:media="http://net.sourceforge.openutils/mgnlMedia">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${actpage.title}</title>
- <cms:init />
- </head>
- <body>
- <h1>${actpage.title}</h1>
-
- <cms:area name="main" />
- </body>
- </html>
-</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/bootstrap.min.css (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/samples/css/bootstrap.min.css 2013-10-13 18:56:59 UTC (rev 4374)
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-13 15:57:37
|
Revision: 4373
http://openutils.svn.sourceforge.net/openutils/?rev=4373&view=rev
Author: fgiust
Date: 2013-10-13 15:57:34 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
API updates
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-10-13 15:34:11 UTC (rev 4372)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-10-13 15:57:34 UTC (rev 4373)
@@ -18,10 +18,7 @@
*/
package it.openutils.mgnlutils.test;
-
-import info.magnolia.cms.beans.config.ContentRepository;
-import info.magnolia.cms.beans.config.PropertiesInitializer;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.util.ClasspathResourcesUtil;
@@ -50,7 +47,6 @@
import info.magnolia.module.model.reader.BetwixtModuleDefinitionReader;
import info.magnolia.module.model.reader.DependencyCheckerImpl;
import info.magnolia.objectfactory.Components;
-import info.magnolia.objectfactory.DefaultComponentProvider;
import info.magnolia.objectfactory.configuration.ComponentConfiguration;
import info.magnolia.objectfactory.configuration.ComponentProviderConfiguration;
import info.magnolia.objectfactory.configuration.ComponentProviderConfigurationBuilder;
@@ -78,6 +74,7 @@
import java.util.Map;
import javax.jcr.ImportUUIDBehavior;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.io.FileUtils;
@@ -110,7 +107,7 @@
public void setUp() throws Exception
{
// ignore mapping warnings
- org.apache.log4j.Logger.getLogger(ContentRepository.class).setLevel(Level.ERROR);
+ org.apache.log4j.Logger.getLogger(RepositoryManager.class).setLevel(Level.ERROR);
if (!this.getClass().isAnnotationPresent(RepositoryTestConfiguration.class))
{
@@ -172,7 +169,8 @@
// if module is set it is stopped on tearDown
for (ModuleConfiguration module : repositoryTestConfiguration.startModules())
{
- ((ModuleLifecycle) ModuleRegistry.Factory.getInstance().getModuleInstance(module.name())).stop(null);
+ ((ModuleLifecycle) Components.getComponent(ModuleRegistry.class).getModuleInstance(module.name()))
+ .stop(null);
}
if (repositoryTestConfiguration.autostart())
@@ -185,33 +183,36 @@
logger.setLevel(Level.WARN);
}
MgnlContext.release();
- MgnlContext.getSystemContext().release();
- ContentRepository.shutdown();
+ Components.getComponent(SystemContext.class).release();
+
+ Components.getComponent(RepositoryManager.class).shutdown();
if (true)
{
cleanUp();
}
logger.setLevel(originalLogLevel);
}
- SystemProperty.getProperties().clear();
- // ComponentsTestUtil.clear();
- SystemProperty.getProperties().clear();
+ ComponentsTestUtil.clear();
MgnlContext.setInstance(null);
}
// info.magnolia.test.MgnlTestCase.initDefaultImplementations()
- private void initDefaultImplementations() throws IOException, ModuleManagementException {
+ private void initDefaultImplementations() throws IOException, ModuleManagementException
+ {
final List<ModuleDefinition> modules = getModuleDefinitionsForTests();
final ModuleRegistry mr = new ModuleRegistryImpl();
- ModuleManagerImpl mm = new ModuleManagerImpl(null, new FixedModuleDefinitionReader(modules), mr, new DependencyCheckerImpl());
+ ModuleManagerImpl mm = new ModuleManagerImpl(
+ null,
+ new FixedModuleDefinitionReader(modules),
+ mr,
+ new DependencyCheckerImpl());
mm.loadDefinitions();
final TestMagnoliaConfigurationProperties configurationProperties = new TestMagnoliaConfigurationProperties(
- new ModulePropertiesSource(mr),
- new ClasspathPropertySource("/test-magnolia.properties"),
- new InitPathsPropertySource(new TestMagnoliaInitPaths())
- );
+ new ModulePropertiesSource(mr),
+ new ClasspathPropertySource("/test-magnolia.properties"),
+ new InitPathsPropertySource(new TestMagnoliaInitPaths()));
SystemProperty.setMagnoliaConfigurationProperties(configurationProperties);
ComponentsTestUtil.setInstance(ModuleManager.class, mm);
@@ -221,34 +222,50 @@
ComponentsTestUtil.setImplementation(RepositoryManager.class, DefaultRepositoryManager.class);
ComponentProviderConfigurationBuilder configurationBuilder = new ComponentProviderConfigurationBuilder();
- ComponentProviderConfiguration configuration = configurationBuilder.getComponentsFromModules("system", mr.getModuleDefinitions());
+ ComponentProviderConfiguration configuration = configurationBuilder.getComponentsFromModules(
+ "system",
+ mr.getModuleDefinitions());
configuration.combine(configurationBuilder.getComponentsFromModules("main", mr.getModuleDefinitions()));
- // Content2BeanProcessorImpl uses dependency injection and since we don't have that with MockComponentProvider we
+ // Content2BeanProcessorImpl uses dependency injection and since we don't have that with MockComponentProvider
+ // we
// need to manually create this object and replace the component configuration read from core.xml
final TypeMappingImpl typeMapping = new TypeMappingImpl();
configuration.registerInstance(TypeMapping.class, typeMapping);
configuration.registerInstance(Content2BeanProcessor.class, new Content2BeanProcessorImpl(typeMapping));
- for (Map.Entry<Class, ComponentConfiguration> entry : configuration.getComponents().entrySet()) {
+ for (Map.Entry<Class, ComponentConfiguration> entry : configuration.getComponents().entrySet())
+ {
ComponentConfiguration value = entry.getValue();
- if (value instanceof ImplementationConfiguration) {
+ if (value instanceof ImplementationConfiguration)
+ {
ImplementationConfiguration config = (ImplementationConfiguration) value;
ComponentsTestUtil.setImplementation(config.getType(), config.getImplementation());
- } else if (value instanceof InstanceConfiguration) {
+ }
+ else if (value instanceof InstanceConfiguration)
+ {
InstanceConfiguration config = (InstanceConfiguration) value;
ComponentsTestUtil.setInstance(config.getType(), config.getInstance());
- } else if (value instanceof ProviderConfiguration) {
+ }
+ else if (value instanceof ProviderConfiguration)
+ {
ProviderConfiguration config = (ProviderConfiguration) value;
ComponentsTestUtil.setImplementation(config.getType(), config.getProviderClass());
- } else if (value instanceof ConfiguredComponentConfiguration) {
+ }
+ else if (value instanceof ConfiguredComponentConfiguration)
+ {
ConfiguredComponentConfiguration config = (ConfiguredComponentConfiguration) value;
- ComponentsTestUtil.setConfigured(config.getType(), config.getWorkspace(), config.getPath(), config.isObserved());
+ ComponentsTestUtil.setConfigured(
+ config.getType(),
+ config.getWorkspace(),
+ config.getPath(),
+ config.isObserved());
}
}
- for (Map.Entry<Class<?>, Class<?>> entry : configuration.getTypeMapping().entrySet()) {
- ComponentsTestUtil.setImplementation((Class)entry.getKey(), (Class)entry.getValue());
+ for (Map.Entry<Class< ? >, Class< ? >> entry : configuration.getTypeMapping().entrySet())
+ {
+ ComponentsTestUtil.setImplementation((Class) entry.getKey(), (Class) entry.getValue());
}
}
@@ -256,8 +273,10 @@
/**
* Override this method to provide the appropriate list of modules your tests need.
*/
- protected List<ModuleDefinition> getModuleDefinitionsForTests() throws ModuleManagementException {
- final ModuleDefinition core = new BetwixtModuleDefinitionReader().readFromResource("/META-INF/magnolia/core.xml");
+ protected List<ModuleDefinition> getModuleDefinitionsForTests() throws ModuleManagementException
+ {
+ final ModuleDefinition core = new BetwixtModuleDefinitionReader()
+ .readFromResource("/META-INF/magnolia/core.xml");
return Collections.singletonList(core);
}
@@ -294,7 +313,7 @@
protected void modifyContextesToUseRealRepository()
{
- SystemContext systemContext = MgnlContext.getSystemContext();
+ SystemContext systemContext = Components.getComponent(SystemContext.class);
RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class);
SystemRepositoryStrategy repositoryStrategy = new SystemRepositoryStrategy(repositoryManager);
@@ -312,9 +331,6 @@
logger.setLevel(Level.WARN);
}
- ContentRepository.REPOSITORY_USER = SystemProperty.getProperty("magnolia.connection.jcr.userId");
- ContentRepository.REPOSITORY_PSWD = SystemProperty.getProperty("magnolia.connection.jcr.password");
-
InputStream repositoryConfigFileStream = ClasspathResourcesUtil
.getResource(repositoryConfigFileName)
.openStream();
@@ -333,7 +349,7 @@
IOUtils.closeQuietly(jackrabbitRepositoryConfigFileStream);
- ContentRepository.init();
+ Components.getComponent(RepositoryManager.class).init();
modifyContextesToUseRealRepository();
@@ -353,7 +369,8 @@
private void cleanUp() throws IOException
{
- FileUtils.deleteDirectory(new File(SystemProperty.getProperty("magnolia.repositories.home")));
+ FileUtils.deleteDirectory(new File(Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+ "magnolia.repositories.home")));
}
/**
@@ -393,15 +410,19 @@
* @param moduleClass ModuleClass
* @throws Content2BeanException if the module configuration can't be successfully parsed.
* @return module instance
+ * @throws RepositoryException
*/
protected ModuleLifecycle startModule(String modulename, Class< ? extends ModuleLifecycle> moduleClass)
- throws Content2BeanException
+ throws Content2BeanException, RepositoryException
{
// register and start module
- Content content = ContentUtil.getContent("config", "/modules/" + modulename + "/config");
- ModuleLifecycle module = (ModuleLifecycle) Content2BeanUtil.toBean(content, true, moduleClass);
+ Node node = MgnlContext.getJCRSession("config").getNode("/modules/" + modulename + "/config");
+ ModuleLifecycle module = (ModuleLifecycle) Content2BeanUtil.toBean(
+ ContentUtil.asContent(node),
+ true,
+ moduleClass);
module.start(null);
- ModuleRegistry.Factory.getInstance().registerModuleInstance(modulename, module);
+ Components.getComponent(ModuleRegistry.class).registerModuleInstance(modulename, module);
return module;
}
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java 2013-10-13 15:34:11 UTC (rev 4372)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java 2013-10-13 15:57:34 UTC (rev 4373)
@@ -19,17 +19,19 @@
package it.openutils.mgnlutils.test.junit;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnlutils.test.JUnitRepositoryTestcase;
import it.openutils.mgnlutils.test.ModuleConfiguration;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestModule;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.junit.Assert;
import org.junit.Test;
@@ -45,26 +47,28 @@
@Test
public void repositoryTestConfigurationTest() throws RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE);
- Assert.assertNotNull(hm);
- Content pets = hm.getContent("/pets");
+ Session session = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
+ Assert.assertNotNull(session);
+
+ Node pets = session.getNode("/pets");
Assert.assertNotNull(pets);
- Content letters = hm.getContent("/letters");
+ Node letters = session.getNode("/letters");
Assert.assertNotNull(letters);
- Assert.assertEquals(letters.getChildren().size(), 26);
+ Assert.assertEquals(NodeUtil.getCollectionFromNodeIterator(letters.getNodes()).size(), 26);
}
@Test
public void moduleConfigAndStartTest()
{
- ModuleRegistry mr = ModuleRegistry.Factory.getInstance();
+ ModuleRegistry mr = Components.getComponent(ModuleRegistry.class);
+
Assert.assertTrue(mr.getModuleNames().contains("testmodule"));
- TestModule tm = (TestModule) ModuleRegistry.Factory.getInstance().getModuleInstance("testmodule");
+ TestModule tm = (TestModule) Components.getComponent(ModuleRegistry.class).getModuleInstance("testmodule");
Assert.assertNotNull(tm);
Assert.assertTrue(tm.isStarted());
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java 2013-10-13 15:34:11 UTC (rev 4372)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java 2013-10-13 15:57:34 UTC (rev 4373)
@@ -19,17 +19,19 @@
package it.openutils.mgnlutils.test.testng;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnlutils.test.ModuleConfiguration;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestModule;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -45,26 +47,26 @@
@Test
public void repositoryTestConfigurationTest() throws RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE);
- Assert.assertNotNull(hm);
+ Session session = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
+ Assert.assertNotNull(session);
- Content pets = hm.getContent("/pets");
+ Node pets = session.getNode("/pets");
Assert.assertNotNull(pets);
- Content letters = hm.getContent("/letters");
+ Node letters = session.getNode("/letters");
Assert.assertNotNull(letters);
- Assert.assertEquals(letters.getChildren().size(), 26);
+ Assert.assertEquals(NodeUtil.getCollectionFromNodeIterator(letters.getNodes()).size(), 26);
}
@Test
public void moduleConfigAndStartTest()
{
- ModuleRegistry mr = ModuleRegistry.Factory.getInstance();
+ ModuleRegistry mr = Components.getComponent(ModuleRegistry.class);
Assert.assertTrue(mr.getModuleNames().contains("testmodule"));
- TestModule tm = (TestModule) ModuleRegistry.Factory.getInstance().getModuleInstance("testmodule");
+ TestModule tm = (TestModule) mr.getModuleInstance("testmodule");
Assert.assertNotNull(tm);
Assert.assertTrue(tm.isStarted());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-13 15:34:15
|
Revision: 4372
http://openutils.svn.sourceforge.net/openutils/?rev=4372&view=rev
Author: fgiust
Date: 2013-10-13 15:34:11 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
update APIs
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/NoDefaultBundlesMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesExtract.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-10-13 15:34:11 UTC (rev 4372)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -101,10 +102,16 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltests</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.2</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -19,26 +19,26 @@
package net.sourceforge.openutils.mgnlmessages.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import javax.inject.Singleton;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -49,13 +49,13 @@
* @author molaschi
*/
@Singleton
-public class MessagesConfigurationManager extends ObservedManager
+public class MessagesConfigurationManager extends ObservedManagerAdapter
{
/**
* Folder type
*/
- public static final ItemType FOLDER = ItemType.CONTENT;
+ public static final String FOLDER = MgnlNodeType.NT_CONTENT;
private List<Locale> locales = new ArrayList<Locale>();
@@ -75,66 +75,75 @@
*/
@Override
@SuppressWarnings("unchecked")
- protected void onRegister(Content node)
+ protected void onRegister(Node node)
{
- if (node.getNodeDataCollection() != null)
+ try
{
- locales.clear();
-
- for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
+ if (node.hasProperties())
{
- Content langNode = (Content) iter.next();
- locales.add(new Locale(NodeDataUtil.getString(langNode, "language"), NodeDataUtil.getString(
- langNode,
- "country")));
- }
+ locales.clear();
- Collections.sort(locales, new Comparator<Locale>()
- {
+ Iterable<Node> nodes = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ for (Node langNode : nodes)
+ {
+ locales.add(new Locale(PropertyUtil.getString(langNode, "language"), PropertyUtil.getString(
+ langNode,
+ "country")));
+ }
- /**
- * {@inheritDoc}
- */
- public int compare(Locale o1, Locale o2)
+ Collections.sort(locales, new Comparator<Locale>()
{
- if (o1.getLanguage().equals(o2.getLanguage()))
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compare(Locale o1, Locale o2)
{
- return o1.getCountry().compareTo(o2.getCountry());
+ if (o1.getLanguage().equals(o2.getLanguage()))
+ {
+ return o1.getCountry().compareTo(o2.getCountry());
+ }
+
+ return o1.getLanguage().compareTo(o2.getLanguage());
}
- return o1.getLanguage().compareTo(o2.getLanguage());
- }
-
- });
+ });
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
}
- public static MessagesConfigurationManager getInstance()
- {
- return (MessagesConfigurationManager) FactoryUtil.getSingleton(MessagesConfigurationManager.class);
- }
-
public static List<Locale> getAvaiableLocales()
{
- return getInstance().getLocales();
+ return Components.getComponent(MessagesConfigurationManager.class).getLocales();
}
@SuppressWarnings("unchecked")
public static List<String> getBaseNames()
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(RepositoryConstants.CONFIG);
+ Session session;
try
{
- Content basenamesNode = mgr.getContent("/modules/messages/basenames");
- if (basenamesNode == null || !basenamesNode.hasChildren(ItemType.CONTENTNODE.getSystemName()))
- {
- return new ArrayList<String>();
- }
+ session = Components.getComponent(SystemContext.class).getJCRSession(RepositoryConstants.CONFIG);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ try
+ {
+ Node basenamesNode = session.getNode("/modules/messages/basenames");
+
+ Iterable<Node> nodes = NodeUtil.getNodes(basenamesNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
List<String> basenames = new ArrayList<String>();
- for (Iterator it = basenamesNode.getChildren(ItemType.CONTENTNODE.getSystemName()).iterator(); it.hasNext();)
+
+ for (Node bn : nodes)
{
- Content bn = (Content) it.next();
- basenames.add(NodeDataUtil.getString(bn, "basename"));
+ basenames.add(PropertyUtil.getString(bn, "basename"));
}
return basenames;
}
@@ -146,49 +155,35 @@
public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MessagesModuleLifecycle.REPO);
+ Session session;
+ try
+ {
+ session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
String path = "/" + StringUtils.replace(key, ".", "/");
- Content content = getOrCreateFullPath(mgr, path);
+ Node content = NodeUtil.createPath(session.getRootNode(), path, MgnlNodeType.NT_CONTENTNODE);
+
if (!StringUtils.isEmpty(locale))
{
- NodeData nd = NodeDataUtil.getOrCreate(content, locale);
if (!StringUtils.isEmpty(value))
{
- nd.setValue(value);
+ content.setProperty(locale, value);
}
else
{
- nd.delete();
+ NodeUtilsExt.deletePropertyIfExist(content, locale);
}
}
- mgr.save();
+ session.save();
}
- private static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- }
-
- return mgr.createContent(parent, label, ItemType.CONTENTNODE.getSystemName());
- }
- }
-
/**
* Returns the locales.
* @return the locales
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -20,13 +20,19 @@
package net.sourceforge.openutils.mgnlmessages.el;
import info.magnolia.cms.beans.config.ServerConfiguration;
-import info.magnolia.cms.i18n.I18nContentSupportFactory;
+import info.magnolia.cms.i18n.I18nContentSupport;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.security.PermissionUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.text.MessageFormat;
+import javax.jcr.RepositoryException;
+
import net.sourceforge.openutils.elfunctions.ElStringUtils;
import org.apache.commons.lang.StringEscapeUtils;
@@ -47,20 +53,19 @@
{
if (defaultLocale)
{
- return MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getFallbackLocale()).get(
- key,
- arguments);
+ return MessagesManager
+ .getMessages(Components.getComponent(I18nContentSupport.class).getFallbackLocale())
+ .get(key, arguments);
}
else
{
- String value = MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getLocale()).get(
- key,
- arguments);
+ String value = MessagesManager
+ .getMessages(Components.getComponent(I18nContentSupport.class).getLocale())
+ .get(key, arguments);
if (fallback && (StringUtils.isBlank(value) || StringUtils.startsWith(value, "???")))
{
- return MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getFallbackLocale()).get(
- key,
- arguments);
+ return MessagesManager.getMessages(
+ Components.getComponent(I18nContentSupport.class).getFallbackLocale()).get(key, arguments);
}
return value;
}
@@ -70,27 +75,39 @@
public static String messageSimple(String key, Object[] arguments)
{
- if (MgnlContext.getAggregationState().getMainContent() != null
- && (ServerConfiguration.getInstance().isAdmin() && !MgnlContext.getAggregationState().isPreviewMode())
- && MgnlContext.getAggregationState().getMainContent().isGranted(Permission.WRITE)) // equivalent of
- // CmsFunctions.canEdit()
+ try
{
- String keyCssClass = StringUtils.replace(key, ".", "_");
+ if (MgnlContext.getAggregationState().getMainContent() != null
+ && (Components.getComponent(ServerConfiguration.class).isAdmin() && !MgnlContext
+ .getAggregationState()
+ .isPreviewMode())
+ && PermissionUtil.isGranted(MgnlUtilsDeprecatedAdapters.getMainContent(), Permission.WRITE))
+ {
- String tag = MessageFormat.format(MSGS_TPL, keyCssClass, key, I18nContentSupportFactory
- .getI18nSupport()
- .getLocale(), I18nContentSupportFactory.getI18nSupport().getFallbackLocale(),
- // evito di sostituire i placeholder quando sono in
- // edit-mode
- // StringEscapeUtils.escapeHtml(message(key, false, true,
- // arguments)),
- StringEscapeUtils.escapeHtml(message(key, false, true)),
- // evito di sostituire i placeholder quando sono in
- // edit-mode
- // message(key, false, false, arguments));
- message(key, false, false));
- return tag;
+ String keyCssClass = StringUtils.replace(key, ".", "_");
+
+ String tag = MessageFormat.format(
+ MSGS_TPL,
+ keyCssClass,
+ key,
+ Components.getComponent(I18nContentSupport.class).getLocale(),
+ Components.getComponent(I18nContentSupport.class).getFallbackLocale(),
+ // evito di sostituire i placeholder quando sono in
+ // edit-mode
+ // StringEscapeUtils.escapeHtml(message(key, false, true,
+ // arguments)),
+ StringEscapeUtils.escapeHtml(message(key, false, true)),
+ // evito di sostituire i placeholder quando sono in
+ // edit-mode
+ // message(key, false, false, arguments));
+ message(key, false, false));
+ return tag;
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
return message(key, true, false, arguments);
}
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -19,12 +19,11 @@
package net.sourceforge.openutils.mgnlmessages.i18n;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.AbstractMessagesImpl;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.cms.util.ObservationUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.Iterator;
@@ -32,9 +31,11 @@
import java.util.Locale;
import java.util.MissingResourceException;
+import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.observation.EventIterator;
import javax.jcr.observation.EventListener;
@@ -89,22 +90,22 @@
try
{
String handle = StringUtils.replace(key, ".", "/");
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(
+ Session hm = Components.getComponent(SystemContext.class).getJCRSession(
MessagesConfigurationManager.MESSAGES_REPO);
- Content c = hm.getContent(handle);
+ Node c = hm.getNode(handle);
String locale1 = this.locale.getLanguage() + "_" + this.locale.getCountry();
String locale2 = this.locale.getLanguage();
- if (c == null || (!c.hasNodeData(locale1) && !c.hasNodeData(locale2)))
+ if (c == null || (!c.hasProperty(locale1) && !c.hasProperty(locale2)))
{
return "???" + key + "???";
}
- if (c.hasNodeData(locale1))
+ if (c.hasProperty(locale1))
{
- return NodeDataUtil.getString(c, locale1);
+ return PropertyUtil.getString(c, locale1);
}
else
{
- return NodeDataUtil.getString(c, locale2);
+ return PropertyUtil.getString(c, locale2);
}
}
catch (MissingResourceException e)
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -22,6 +22,7 @@
import info.magnolia.cms.i18n.AbstractMessagesImpl;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.ClasspathResourcesUtil;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
import java.io.InputStream;
@@ -103,7 +104,7 @@
stream = ClasspathResourcesUtil.getStream("/"
+ StringUtils.replace(basename, ".", "/")
+ "_"
- + MessagesManager.getInstance().getDefaultLocale().getLanguage()
+ + Components.getComponent(MessagesManager.class).getDefaultLocale().getLanguage()
+ ".properties", false);
}
if (stream == null)
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -22,6 +22,7 @@
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.objectfactory.Components;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import org.slf4j.Logger;
@@ -47,9 +48,9 @@
public void start(ModuleLifecycleContext ctx)
{
log.info("Starting module messages");
- ctx.registerModuleObservingComponent("locales", MessagesConfigurationManager.getInstance());
+ ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
- MessagesManager.getInstance().init();
+ Components.getComponent(MessagesManager.class).init();
}
/**
Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -1,231 +0,0 @@
-/**
- *
- * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
- * Copyright(C) 2008-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.mgnlmessages.pages;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
-import info.magnolia.repository.RepositoryConstants;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author molaschi
- * @version $Id: $
- */
-public class ExtractMessagesFromDialogsPage extends TemplatedMVCHandler
-{
-
- private List<String> dialogsRoot;
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(ExtractMessagesFromDialogsPage.class);
-
- /**
- * @param name
- * @param request
- * @param response
- */
- public ExtractMessagesFromDialogsPage(String name, HttpServletRequest request, HttpServletResponse response)
- {
- super(name, request, response);
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- @Override
- public String show()
- {
- dialogsRoot = new ArrayList<String>();
- QueryManager qm = MgnlContext.getQueryManager(RepositoryConstants.CONFIG);
- Query q;
- try
- {
- q = qm.createQuery("//dialogs", Query.XPATH);
-
- QueryResult qr = q.execute();
- Collection<Content> dialogs = qr.getContent();
- for (Content dialog : dialogs)
- {
- dialogsRoot.add(dialog.getHandle());
- }
-
- q = qm.createQuery("//paragraphs", Query.XPATH);
-
- qr = q.execute();
- dialogs = qr.getContent();
- for (Content dialog : dialogs)
- {
- dialogsRoot.add(dialog.getHandle());
- }
- }
- catch (RepositoryException e)
- {
- // ignore
- }
-
- return super.show();
- }
-
- /**
- * Extract messages keys
- * @return view
- */
- public String extract()
- {
- HierarchyManager hmConfig = MgnlContext.getHierarchyManager(RepositoryConstants.CONFIG);
- QueryManager qm = hmConfig.getQueryManager();
- HierarchyManager hm = MgnlContext.getHierarchyManager(MessagesModuleLifecycle.REPO);
- for (String dialogRoot : this.request.getParameterValues("dialogsRoots"))
- {
- try
- {
- doExtraction(dialogRoot, "label", qm, hm, hmConfig);
- }
- catch (RepositoryException e)
- {
- log.error("Error extracting labels from dialogs and paragraphs", e);
- }
-
- try
- {
- doExtraction(dialogRoot, "description", qm, hm, hmConfig);
- }
- catch (RepositoryException e)
- {
- log.error("Error extracting description from dialogs and paragraphs", e);
- }
-
- try
- {
- doExtraction(dialogRoot, "title", qm, hm, hmConfig);
- }
- catch (RepositoryException e)
- {
- log.error("Error extracting description from dialogs and paragraphs", e);
- }
- }
-
- return this.show();
- }
-
- @SuppressWarnings("unchecked")
- private void doExtraction(String root, String property, QueryManager qm, HierarchyManager hmMessages,
- HierarchyManager hmConfig) throws RepositoryException
- {
- Query q = qm.createQuery(root.substring(1) + "//*[@" + property + "]", Query.XPATH);
-
- QueryResult qr = q.execute();
- Collection<Content> labelParents = new ArrayList<Content>();
- labelParents.addAll(qr.getContent(ItemType.CONTENTNODE.getSystemName()));
- labelParents.addAll(qr.getContent(ItemType.CONTENT.getSystemName()));
- for (Content labelParent : labelParents)
- {
- NodeData labelNd = labelParent.getNodeData(property);
- String label = labelNd.getString();
- if (!StringUtils.isEmpty(label) && MgnlContext.getMessages().get(label).startsWith("???"))
- {
- String parentPath = labelParent.getHandle();
- parentPath = StringUtils.replace(parentPath, "/modules", "");
- Content parent = getOrCreateFullPath(hmMessages, parentPath);
- Content message = ContentUtil.getOrCreateContent(parent, property, ItemType.CONTENTNODE);
- NodeData nd = NodeDataUtil.getOrCreate(message, "en");
- nd.setValue(label);
- nd = NodeDataUtil.getOrCreate(message, "it");
- nd.setValue(label);
-
- String messageKey = message.getHandle().substring(1);
- messageKey = StringUtils.replace(messageKey, "/", ".");
- labelNd.setValue(messageKey);
- }
- }
- hmMessages.save();
- hmConfig.save();
- }
-
- private Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- }
-
- Content c = mgr.createContent(parent, label, ItemType.CONTENTNODE.getSystemName());
- mgr.save();
- return c;
- }
- }
-
- /**
- * Returns the dialogsRoot.
- * @return the dialogsRoot
- */
- public List<String> getDialogsRoot()
- {
- return dialogsRoot;
- }
-
- /**
- * Sets the dialogsRoot.
- * @param dialogsRoot the dialogsRoot to set
- */
- public void setDialogsRoot(List<String> dialogsRoot)
- {
- this.dialogsRoot = dialogsRoot;
- }
-
-}
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmessages.pages;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MetaData;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,8 +37,10 @@
import java.util.Locale;
import java.util.Set;
+import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -49,7 +52,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.sun.xml.internal.ws.util.MetadataUtil;
+
/**
* @author manuel
* @version $Id
@@ -185,16 +190,16 @@
{
try
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MessagesModuleLifecycle.REPO);
+ Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+
String path = "/" + StringUtils.replace(key, ".", "/");
- mgr.delete(path);
+ session.removeItem(path);
+ session.save();
- mgr.save();
-
String parent = StringUtils.substringBeforeLast(path, "/");
if (!StringUtils.isEmpty(parent))
{
- if (!mgr.getContent(parent).hasChildren(ItemType.CONTENTNODE.getSystemName()))
+ if (!session.getNode(parent).hasNodes())
{
key = StringUtils.replace(parent.substring(1), "/", ".");
removekey();
@@ -283,15 +288,15 @@
*/
protected void moveNode(String source, String destination) throws RepositoryException
{
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(MessagesModuleLifecycle.REPO);
+ Session session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
String goTo = destination;
- if (hm.isExist(destination))
+ if (session.itemExists(destination))
{
String parentPath = StringUtils.substringBeforeLast(destination, "/"); //$NON-NLS-1$
String label = StringUtils.substringAfterLast(destination, "/"); //$NON-NLS-1$
- label = Path.getUniqueLabel(hm, parentPath, label);
+ label = Path.getUniqueLabel(session, parentPath, label);
goTo = parentPath + "/" + label; //$NON-NLS-1$
}
if (destination.indexOf(source + "/") == 0)
@@ -302,18 +307,18 @@
try
{
- hm.moveTo(source, goTo);
+ session.move(source, goTo);
}
catch (Exception e)
{
return;
}
- Content newContent = hm.getContent(destination);
+ Node newContent = session.getNode(destination);
try
{
- newContent.updateMetaData();
- newContent.getMetaData().setUnActivated();
+ MetaDataUtil.updateMetaData(newContent);
+ MetaDataUtil.getMetaData(newContent).setUnActivated();
}
catch (RepositoryException e)
{
@@ -322,7 +327,7 @@
log.debug("Exception caught: " + e.getMessage(), e); //$NON-NLS-1$
}
}
- hm.save();
+ session.save();
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/NoDefaultBundlesMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/NoDefaultBundlesMessagesImpl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/NoDefaultBundlesMessagesImpl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -19,11 +19,10 @@
package net.sourceforge.openutils.mgnlmessages.pages;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.util.ClasspathResourcesUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +31,9 @@
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import net.sourceforge.openutils.mgnlmessages.i18n.EmptyResourceBundle;
@@ -100,15 +101,16 @@
try
{
String handle = StringUtils.replace(key, ".", "/");
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(
+ Session hm = Components.getComponent(SystemContext.class).getJCRSession(
MessagesConfigurationManager.MESSAGES_REPO);
- Content c = hm.getContent(handle);
+
+ Node c = hm.getNode(handle);
String locale1 = this.locale.getLanguage()
+ (StringUtils.isEmpty(this.locale.getCountry()) ? "" : "_" + this.locale.getCountry());
- if (c != null && c.hasNodeData(locale1))
+ if (c != null && c.hasProperty(locale1))
{
- return NodeDataUtil.getString(c, locale1);
+ return PropertyUtil.getString(c, locale1);
}
}
@@ -168,9 +170,7 @@
return bundle;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean equals(Object object)
{
if (!(object instanceof NoDefaultBundlesMessagesImpl))
@@ -181,9 +181,7 @@
return new EqualsBuilder().append(this.basename, rhs.basename).append(this.locale, rhs.locale).isEquals();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public int hashCode()
{
return new HashCodeBuilder(-399088031, -1971683455).append(basename).append(locale).toHashCode();
Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesExtract.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesExtract.xml 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesExtract.xml 2013-10-13 15:34:11 UTC (rev 4372)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="messagesExtract" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>f0cca3ff-ecda-4678-b0ad-9565e2ce4229</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmessages.pages.ExtractMessagesFromDialogsPage</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmessages.lang.messages</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-06-18T15:49:04.038Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2008-07-10T13:14:27.562Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-09-11T14:53:28.260+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -49,7 +49,7 @@
public void setUp() throws Exception
{
super.setUp();
- MgnlContext.getHierarchyManager(MessagesConfigurationManager.MESSAGES_REPO).save();
+ MgnlContext.getJCRSession(MessagesConfigurationManager.MESSAGES_REPO).save();
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -20,7 +20,6 @@
package it.openutils.mgnlutils.api;
import info.magnolia.cms.core.Path;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.context.MgnlContext;
@@ -191,14 +190,16 @@
return toBean(node, false, outclass);
}
+ @SuppressWarnings("deprecation")
public static Object toBean(Node node, boolean recursive, Class outclass) throws Content2BeanException
{
- return Content2BeanUtil.toBean(ContentUtil.asContent(node), recursive, outclass);
+ return Content2BeanUtil.toBean(info.magnolia.cms.util.ContentUtil.asContent(node), recursive, outclass);
}
+ @SuppressWarnings("deprecation")
public static String getUniqueLabel(Node parent, String label)
{
- return Path.getUniqueLabel(ContentUtil.asContent(parent), label);
+ return Path.getUniqueLabel(info.magnolia.cms.util.ContentUtil.asContent(parent), label);
}
public static Node wrap(Node node)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4371
http://openutils.svn.sourceforge.net/openutils/?rev=4371&view=rev
Author: fgiust
Date: 2013-10-13 13:46:57 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
API cleanup
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
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-13 13:43:41 UTC (rev 4370)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2013-10-13 13:46:57 UTC (rev 4371)
@@ -21,10 +21,9 @@
import info.magnolia.cms.util.ObservationUtil;
import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.io.IOException;
@@ -125,9 +124,7 @@
Node tagCloudNode = allChildren.next();
try
{
- TagCloud tagCloud = (TagCloud) Content2BeanUtil.toBean(
- info.magnolia.cms.util.ContentUtil.asContent(tagCloudNode),
- TagCloud.class);
+ TagCloud tagCloud = (TagCloud) NodeUtilsExt.toBean(tagCloudNode, TagCloud.class);
if (!tagCloud.isEnabled())
{
continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-13 13:43:46
|
Revision: 4370
http://openutils.svn.sourceforge.net/openutils/?rev=4370&view=rev
Author: fgiust
Date: 2013-10-13 13:43:41 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
update APIs
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Property Changed:
----------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-13 13:43:41 UTC (rev 4370)
@@ -206,7 +206,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>4.5.3-SNAPSHOT</version>
+ <version>4.5.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -276,7 +276,7 @@
</dependencyManagement>
<properties>
<magnolia.version>4.5.11</magnolia.version>
- <stk.version>2.0</stk.version>
+ <stk.version>2.0.10</stk.version>
<jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
<build>
Index: magnoliamodules/trunk/openutils-mgnlcontextmenu
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu 2013-10-13 13:43:41 UTC (rev 4370)
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,4 ##
.project
.settings
target
+release.properties
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-13 13:43:41 UTC (rev 4370)
@@ -147,7 +147,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-standard-templating-kit</artifactId>
- <version>2.0</version>
+ <version>2.0.10</version>
<optional>true</optional>
<exclusions>
<exclusion>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.dam;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
@@ -33,12 +32,15 @@
* Dam-support for the SimpleMedia module.
* @author Ernst Bunders
*/
+@SuppressWarnings("deprecation")
public class SimpleMediaAsset extends InternalAsset
{
- public SimpleMediaAsset(SimpleMediaContentHandler handler, Content metaDataNode, NodeData binaryNodeData, TemplatingFunctions templatingFunctions)
- throws AssetNotFoundException,
- RepositoryException
+ public SimpleMediaAsset(
+ SimpleMediaContentHandler handler,
+ Content metaDataNode,
+ NodeData binaryNodeData,
+ TemplatingFunctions templatingFunctions) throws AssetNotFoundException, RepositoryException
{
super(handler, metaDataNode, "", binaryNodeData, templatingFunctions);
}
@@ -52,7 +54,7 @@
@Override
public String getCaption()
{
- return getMetaDataValue("title", super.getTitle());
+ return getMetaDataValue("title", super.getTitle(), true);
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.dam;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
@@ -42,6 +41,7 @@
* Dam-support for the SimpleMedia module.
* @author Ernst Bunders
*/
+@SuppressWarnings("deprecation")
public class SimpleMediaContentHandler extends DMSDAMHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -107,7 +107,7 @@
throws AccessDeniedException, RepositoryException
{
media.setProperty("provider", "weebo");
- ExternalVideoUtil.setStatus(media.getUUID(), AsyncUploadExternalVideoProvider.STATUS_TO_UPLOAD);
+ ExternalVideoUtil.setStatus(media.getIdentifier(), AsyncUploadExternalVideoProvider.STATUS_TO_UPLOAD);
super.saveFromZipFile(media, f, cleanFileName, extension);
}
@@ -166,6 +166,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getFilename(Node media)
{
ExternalVideoProvider provider = getVideoProvider(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -1,9 +1,6 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
@@ -110,9 +107,9 @@
return StringUtils.join(new String[]{ND_ERROR, suffix != null ? "-" : null, suffix });
}
- public static String getStatus(final Content mediaNode, String statusSuffix)
+ public static String getStatus(final Node mediaNode, String statusSuffix)
{
- return NodeDataUtil.getString(mediaNode, getStatusProperty(statusSuffix));
+ return PropertyUtil.getString(mediaNode, getStatusProperty(statusSuffix));
}
public static boolean setStatus(final String mediaUUID, final String statusSuffix, final String status)
@@ -124,19 +121,16 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
if (media != null)
{
String statusProperty = getStatusProperty(statusSuffix);
- if (!media.hasNodeData(statusProperty)
- || !StringUtils.equals(NodeDataUtil.getString(media, statusProperty), status))
+ if (!media.hasProperty(statusProperty)
+ || !StringUtils.equals(PropertyUtil.getString(media, statusProperty), status))
{
- NodeDataUtil.getOrCreateAndSet(media, statusProperty, status);
- NodeDataUtil.getOrCreateAndSet(
- media,
- statusProperty + "LastModified",
- Calendar.getInstance());
- media.save();
+ media.setProperty(statusProperty, status);
+ media.setProperty(statusProperty + "LastModified", Calendar.getInstance());
+ media.getSession().save();
}
return true;
}
@@ -150,10 +144,10 @@
}
}
- public static boolean hasStatus(final Content mediaNode, final String statusSuffix, final String status)
+ public static boolean hasStatus(final Node mediaNode, final String statusSuffix, final String status)
{
String statusProperty = getStatusProperty(statusSuffix);
- return StringUtils.equals(NodeDataUtil.getString(mediaNode, statusProperty), status);
+ return StringUtils.equals(PropertyUtil.getString(mediaNode, statusProperty), status);
}
public static boolean hasStatus(final String mediaUUID, final String statusSuffix, final String status)
@@ -165,7 +159,7 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
return media != null && hasStatus(media, statusSuffix, status);
}
});
@@ -190,15 +184,12 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
if (media != null)
{
- NodeDataUtil.getOrCreateAndSet(media, getErrorProperty(suffix), true);
- NodeDataUtil.getOrCreateAndSet(
- media,
- getErrorProperty(suffix) + "-" + ND_ERROR_MESSAGE,
- message);
- media.save();
+ media.setProperty(getErrorProperty(suffix), true);
+ media.setProperty(getErrorProperty(suffix) + "-" + ND_ERROR_MESSAGE, message);
+ media.getSession().save();
return true;
}
return false;
@@ -211,6 +202,7 @@
}
}
+ @SuppressWarnings("deprecation")
public static boolean copyPreviewImageToRepository(Node media, final String previewUrl) throws IOException
{
if (StringUtils.isNotBlank(previewUrl))
@@ -238,7 +230,7 @@
try
{
SaveHandlerImpl.saveDocument(
- ContentUtil.asContent(media),
+ info.magnolia.cms.util.ContentUtil.asContent(media),
doc,
MediaWithPreviewImageTypeHandler.PREVIEW_NODEDATA_NAME,
"preview",
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -1,21 +1,17 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.context.MgnlContext;
import info.magnolia.context.SystemContext;
import info.magnolia.objectfactory.Components;
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import org.apache.commons.lang.math.NumberUtils;
-
/**
* @author molaschi
* @version $Id: $
@@ -31,17 +27,24 @@
@Override
public void uploadVideo(final String mediaUUID) throws IOException, RepositoryException
{
- Content media = Components
+ Node media = Components
.getComponent(SystemContext.class)
- .getHierarchyManager(MediaModule.REPO)
- .getContentByUUID(mediaUUID);
- NodeData file = media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
- long size = NumberUtils.toLong(file.getAttribute(FileProperties.PROPERTY_SIZE), -1);
+ .getJCRSession(MediaModule.REPO)
+ .getNodeByIdentifier(mediaUUID);
+ Node file = media.getNode(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
+
+ long size = -1;
+ if (file.hasProperty(FileProperties.PROPERTY_SIZE))
+ {
+ size = file.getProperty(FileProperties.PROPERTY_SIZE).getLong();
+ }
+
+ // TODO check binary nodedata handling
FtpUtil.upload(
account,
- media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME).getStream(),
+ file.getProperty("jcr:data").getValue().getBinary().getStream(),
size,
- this.getUploadFileName(media.getJCRNode()),
+ this.getUploadFileName(media),
new FtpUtil.UploadProgress()
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -43,6 +43,8 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
+// not to be upgraded, to be rewritten for m5
public class MediaGridColumnType extends AbstractGridColumnType
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,15 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.commands;
-
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.Rule;
import info.magnolia.context.Context;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import java.util.ArrayList;
@@ -35,6 +36,7 @@
import java.util.Iterator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -49,6 +51,8 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
+// activation APIs need a cleanup in Magnolia, everrything is still based on Content
public class MediaActivationCommand extends ActivationCommand
{
@@ -122,7 +126,7 @@
ExchangeException
{
- activateSingleNode(parentPath, node);
+ activateSingleNode(parentPath, node.getJCRNode());
Iterator<Content> children = node.getChildren(new Content.ContentFilter()
{
@@ -155,36 +159,40 @@
* @throws RepositoryException
* @throws ExchangeException
*/
- protected void activateSingleNode(String parentPath, Content node) throws RepositoryException, ExchangeException
+ protected void activateSingleNode(String parentPath, Node node) throws RepositoryException, ExchangeException
{
- if (MediaConfigurationManager.NT_MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
+ if (MediaConfigurationManager.NT_MEDIA.equals(node.getPrimaryNodeType().getName())
+ && MetaDataUtil.getMetaData(node).getIsActivated())
{
// already activated media, should deactivate in order to remove stale resolutions
log
.warn(
"Activating already active media {}, will deactivate existing node in order to remove stale resolutions",
- node.getHandle());
+ NodeUtil.getPathIfPossible(node));
- getSyndicator().deactivate(node);
+ getSyndicator().deactivate(info.magnolia.cms.util.ContentUtil.asContent(node));
}
checkFolderActivation(node);
- getSyndicator().activate(parentPath, node, getOrderingInfo(node));
+ getSyndicator().activate(
+ parentPath,
+ info.magnolia.cms.util.ContentUtil.asContent(node),
+ getOrderingInfo(info.magnolia.cms.util.ContentUtil.asContent(node)));
}
/**
* @param node
* @throws ExchangeException
*/
- private void checkFolderActivation(Content node) throws ExchangeException
+ private void checkFolderActivation(Node node) throws ExchangeException
{
try
{
- List<Content> foldersInPath = new ArrayList<Content>(3);
+ List<Node> foldersInPath = new ArrayList<Node>();
- Content parent = node.getParent();
- while (parent.getLevel() != 0 && !parent.getMetaData().getIsActivated())
+ Node parent = node.getParent();
+ while (parent.getDepth() != 0 && !MetaDataUtil.getMetaData(parent).getIsActivated())
{
foldersInPath.add(parent);
parent = parent.getParent();
@@ -193,12 +201,15 @@
if (!foldersInPath.isEmpty())
{
Collections.reverse(foldersInPath);
- for (Content folder : foldersInPath)
+ for (Node folder : foldersInPath)
{
- log.info("Activating parent folder {}", folder.getHandle());
+ log.info("Activating parent folder {}", NodeUtil.getPathIfPossible(folder));
// folder only, no content
setRule(new Rule(new String[]{MgnlNodeType.NT_METADATA, MgnlNodeType.NT_RESOURCE }));
- getSyndicator().activate(folder.getParent().getHandle(), folder, getOrderingInfo(folder));
+ getSyndicator().activate(
+ NodeUtil.getPathIfPossible(folder.getParent()),
+ ContentUtil.asContent(folder),
+ getOrderingInfo(ContentUtil.asContent(folder)));
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -43,7 +43,7 @@
{
if (!MediaEl.module().isSingleinstance())
{
- Command cmd = Components.getSingleton(CommandsManager.class).getCommand(
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand(
CommandsManager.DEFAULT_CATALOG,
"deactivate");
return cmd.execute(context);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,18 +19,17 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.inject.Singleton;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
@@ -80,7 +79,7 @@
* @version $Id: $
*/
@Singleton
-public class ImageProcessorsManager extends ObservedManager
+public class ImageProcessorsManager extends ObservedManagerAdapter
{
private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
@@ -97,7 +96,7 @@
*/
public static ImageProcessorsManager getInstance()
{
- return Components.getSingleton(ImageProcessorsManager.class);
+ return Components.getComponent(ImageProcessorsManager.class);
}
/**
@@ -115,49 +114,71 @@
*/
@SuppressWarnings("unchecked")
@Override
- protected void onRegister(Content parentNode)
+ protected void onRegister(Node parentNode)
{
- for (Iterator iter = ContentUtil.getAllChildren(parentNode).iterator(); iter.hasNext();)
+
+ Iterable<Node> nodes;
+ try
{
- Content processorsNode = (Content) iter.next();
+ nodes = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error initializing image processor configuration", e);
+ return;
+ }
- for (Iterator iterProcessor = ContentUtil.getAllChildren(processorsNode).iterator(); iterProcessor
- .hasNext();)
+ for (Node processorsNode : nodes)
+ {
+
+ Iterable<Node> processors;
+ try
{
- Content node = (Content) iterProcessor.next();
+ processors = NodeUtil.getNodes(processorsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log
+ .error(
+ "Error initializing image processor configuration for " + NodeUtil.getName(processorsNode),
+ e);
+ continue;
+ }
+ for (Node node : processors)
+ {
try
{
- if (IMAGE_POST_PROCESSORS_NAME.equals(processorsNode.getName()))
+ if (IMAGE_POST_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
{
- String classNameHandler = NodeDataUtil.getString(node, "class");
+ String classNameHandler = PropertyUtil.getString(node, "class");
Class classHandler = Class.forName(classNameHandler);
if (!ImagePostProcessor.class.isAssignableFrom(classHandler))
{
log.error(
"Error getting post processor for {}: class {} not implements ImagePostProcessor",
- node.getHandle(),
+ NodeUtil.getPathIfPossible(node),
classHandler);
continue;
}
ImagePostProcessor imagePostProcessor = (ImagePostProcessor) classHandler.newInstance();
- imagePostProcs.put(node.getName(), imagePostProcessor);
+ imagePostProcs.put(NodeUtil.getName(node), imagePostProcessor);
}
- if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(processorsNode.getName()))
+ if (IMAGE_RESOLUTION_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
{
- String controlChar = node.getName();
+ String controlChar = NodeUtil.getName(node);
- String classNameHandler = NodeDataUtil.getString(node, "class");
+ String classNameHandler = PropertyUtil.getString(node, "class");
Class classHandler = Class.forName(classNameHandler);
if (!ImageResolutionProcessor.class.isAssignableFrom(classHandler))
{
log
.error(
"Error getting resolution processor for {}: class {} not implements ImageResolutionProcessor",
- node.getHandle(),
+ NodeUtil.getPathIfPossible(node),
classHandler);
continue;
}
@@ -171,9 +192,9 @@
imageResProcs.put(controlChar, imageResolutionProcessor);
try
{
- if (node.hasNodeData("aliases"))
+ if (node.hasProperty("aliases"))
{
- String[] aliases = StringUtils.split(NodeDataUtil.getString(node, "aliases"), ",");
+ String[] aliases = StringUtils.split(PropertyUtil.getString(node, "aliases"), ",");
for (String alias : aliases)
{
imageResProcs.put(alias, imageResolutionProcessor);
@@ -188,19 +209,19 @@
}
catch (InstantiationException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
catch (IllegalAccessException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
catch (ClassNotFoundException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
catch (RuntimeException ex)
{
- log.error("Error getting media type configuration for {}", node.getHandle(), ex);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(node), ex);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,26 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.beans.config.URI2RepositoryManager;
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.content2bean.Content2BeanUtil;
-import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -53,7 +43,6 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +61,7 @@
* @author molaschi
*/
@Singleton
-public class MediaConfigurationManager extends ObservedManager
+public class MediaConfigurationManager extends ObservedManagerAdapter
{
private static final String MGNL_MEDIA_TYPE = "mgnl:media";
@@ -112,11 +101,9 @@
*/
@Override
@SuppressWarnings("unchecked")
- protected void onRegister(Content content)
+ protected void onRegister(Node node)
{
- Node node = content.getJCRNode();
-
try
{
for (Iterator<Node> iter = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER).iterator(); iter
@@ -131,9 +118,8 @@
try
{
- Content typeContent = ContentUtil.asContent(typeNode);
- MediaTypeConfiguration conf = (MediaTypeConfiguration) Content2BeanUtil.toBean(
- typeContent,
+ MediaTypeConfiguration conf = (MediaTypeConfiguration) NodeUtilsExt.toBean(
+ typeNode,
true,
MediaTypeConfiguration.class);
@@ -167,7 +153,7 @@
*/
public static MediaConfigurationManager getInstance()
{
- return (MediaConfigurationManager) FactoryUtil.getSingleton(MediaConfigurationManager.class);
+ return Components.getComponent(MediaConfigurationManager.class);
}
/**
@@ -223,74 +209,54 @@
return MediaUsedInManager.getInstance().getUsedInWorkspacePaths(uuid, RepositoryConstants.WEBSITE);
}
- /**
- * Search media
- * @param text text to search
- * @param type if specified restricts the search to the type
- * @return found medias
- * @throws RepositoryException exception working on repository
- * @deprecated use SearchMediaQueryConfiguration.search(...)
- */
- @Deprecated
- public Collection<Content> search(String text, final String type) throws RepositoryException
- {
- return find(null, type, text, true);
- }
+ // /**
+ // * @param path
+ // * @param type
+ // * @param search
+ // * @param recursive
+ // * @return
+ // * @throws RepositoryException
+ // * @deprecated use the find method overload based on Magnolia Criteria API
+ // */
+ // @Deprecated
+ // public Collection<Content> find(String path, String type, String search, boolean recursive)
+ // throws RepositoryException
+ // {
+ // QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
+ // StringBuffer sbQuery = new StringBuffer("/jcr:root/");
+ // path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
+ // if (StringUtils.isNotEmpty(path))
+ // {
+ // sbQuery.append(ISO9075.encodePath(path)).append('/');
+ // }
+ // if (recursive)
+ // {
+ // sbQuery.append('/');
+ // }
+ // sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
+ // List<String> clauses = new ArrayList<String>();
+ // if (StringUtils.isNotBlank(search))
+ // {
+ // clauses.add("jcr:contains(.,'" + StringUtils.replace(search, "'", "''") + "')");
+ // }
+ // if (StringUtils.isNotBlank(type))
+ // {
+ // clauses.add("@type='" + type + "'");
+ // }
+ // if (!clauses.isEmpty())
+ // {
+ // sbQuery.append('[').append(StringUtils.join(clauses, " and ")).append(']');
+ // }
+ // if (StringUtils.isNotBlank(search))
+ // {
+ // sbQuery.append(" order by @jcr:score descending");
+ // }
+ // Query q = qm.createQuery(new String(sbQuery), Query.XPATH);
+ // QueryResult qr = q.execute();
+ // return qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
+ // }
/**
- * @param path
- * @param type
- * @param search
- * @param recursive
- * @return
- * @throws RepositoryException
- * @deprecated use the find method overload based on Magnolia Criteria API
- */
- @Deprecated
- public Collection<Content> find(String path, String type, String search, boolean recursive)
- throws RepositoryException
- {
- QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
- StringBuffer sbQuery = new StringBuffer("/jcr:root/");
- path = StringUtils.removeEnd(StringUtils.removeStart(StringUtils.trimToEmpty(path), "/"), "/");
- if (StringUtils.isNotEmpty(path))
- {
- sbQuery.append(ISO9075.encodePath(path)).append('/');
- }
- if (recursive)
- {
- sbQuery.append('/');
- }
- sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
- List<String> clauses = new ArrayList<String>();
- if (StringUtils.isNotBlank(search))
- {
- clauses.add("jcr:contains(.,'" + StringUtils.replace(search, "'", "''") + "')");
- }
- if (StringUtils.isNotBlank(type))
- {
- clauses.add("@type='" + type + "'");
- }
- if (!clauses.isEmpty())
- {
- sbQuery.append('[').append(StringUtils.join(clauses, " and ")).append(']');
- }
- if (StringUtils.isNotBlank(search))
- {
- sbQuery.append(" order by @jcr:score descending");
- }
- Query q = qm.createQuery(new String(sbQuery), Query.XPATH);
- QueryResult qr = q.execute();
- return qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
- }
-
- @Deprecated
- public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Content media)
- {
- return getMediaTypeConfigurationFromMedia(media.getJCRNode());
- }
-
- /**
* Get the type configuration for a media
* @param media media
* @return type configuration
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,17 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -63,7 +62,7 @@
public static MediaUsedInManager getInstance()
{
- return Components.getComponents(MediaUsedInManager.class);
+ return Components.getComponent(MediaUsedInManager.class);
}
private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
@@ -85,15 +84,25 @@
@Override
protected void onRegister(Node node)
{
- Collection<Content> uiwNodes = node.getChildren(MgnlNodeType.NT_CONTENTNODE);
- for (Content uiwNode : uiwNodes)
+
+ Iterable<Node> uiwNodes;
+ try
{
+ uiwNodes = NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
+ for (Node uiwNode : uiwNodes)
+ {
try
{
- UsedInWorkspace uiw = (UsedInWorkspace) Content2BeanUtil.toBean(uiwNode, UsedInWorkspace.class);
+ UsedInWorkspace uiw = (UsedInWorkspace) NodeUtilsExt.toBean(uiwNode, UsedInWorkspace.class);
if (StringUtils.isEmpty(uiw.getWorkspaceName()))
{
- uiw.setWorkspaceName(uiwNode.getName());
+ uiw.setWorkspaceName(NodeUtil.getName(uiwNode));
}
if (StringUtils.isEmpty(uiw.getNodeType()))
{
@@ -103,7 +112,7 @@
}
catch (Content2BeanException e)
{
- log.error("Error getting media used-in for {}", uiwNode.getHandle(), e);
+ log.error("Error getting media used-in for {}", NodeUtil.getPathIfPossible(uiwNode), e);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.repository.RepositoryConstants;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -18,10 +18,7 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.crop;
-
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.NodeDataUtil;
+
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -50,6 +50,7 @@
private Messages messages;
+ @Override
public void initImageExtensions()
{
// no images, so no preview will be generated
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,9 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.gui.dialog.Dialog;
import info.magnolia.cms.gui.misc.Sources;
@@ -135,7 +135,7 @@
{
super.configureSaveHandler(saveHandler);
- saveHandler.setCreationItemType(MediaConfigurationManager.NT_MEDIA);
+ saveHandler.setCreationItemType(new ItemType(MediaConfigurationManager.NT_MEDIA));
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -226,7 +226,7 @@
{
try
{
- return MgnlContext.getJCRSession(MediaModule.REPO).getNodeByIdentifier(from.getUUID());
+ return MgnlContext.getJCRSession(MediaModule.REPO).getNodeByIdentifier(from.getIdentifier());
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,9 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -51,6 +48,7 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -306,12 +304,14 @@
*/
public String delete()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
-
try
{
- hm.delete(this.node);
- hm.save();
+ Session session = MgnlContext.getInstance().getJCRSession(MediaModule.REPO);
+ if (session.itemExists(this.node))
+ {
+ session.removeItem(this.node);
+ session.save();
+ }
}
catch (RepositoryException ex)
{
@@ -383,15 +383,15 @@
public Node copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
+ Session session = MgnlContext.getJCRSession(MediaModule.REPO);
String goTo = destination;
- if (hm.isExist(destination))
+ if (session.itemExists(destination))
{
String parentPath = StringUtils.substringBeforeLast(destination, "/"); //$NON-NLS-1$
String label = StringUtils.substringAfterLast(destination, "/"); //$NON-NLS-1$
- label = Path.getUniqueLabel(hm, parentPath, label);
+ label = Path.getUniqueLabel(session, parentPath, label);
goTo = parentPath + "/" + label; //$NON-NLS-1$
}
if (move)
@@ -405,7 +405,7 @@
// this.deactivateNode(source);
try
{
- hm.moveTo(source, goTo);
+ session.move(source, goTo);
}
catch (Exception e)
{
@@ -416,13 +416,13 @@
else
{
// copy
- hm.copyTo(source, goTo);
+ session.getWorkspace().copy(source, goTo);
}
- Content newContent = hm.getContent(destination);
+ Node newContent = session.getNode(destination);
try
{
- MetaDataUtil.updateMetaData(newContent.getJCRNode());
- MetaDataUtil.getMetaData(newContent.getJCRNode()).setUnActivated();
+ MetaDataUtil.updateMetaData(newContent);
+ MetaDataUtil.getMetaData(newContent).setUnActivated();
}
catch (Exception e)
{
@@ -431,8 +431,8 @@
log.debug("Exception caught: " + e.getMessage(), e); //$NON-NLS-1$
}
}
- newContent.save();
- return newContent.getJCRNode();
+ session.save();
+ return newContent;
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -25,7 +25,6 @@
import freemarker.template.TemplateModelException;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.i18n.MessagesUtil;
-import info.magnolia.cms.util.RequestFormUtil;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
import java.util.ArrayList;
@@ -102,16 +101,16 @@
* Override the standard method in order to use request.getParameterMap instead of
* requestFormUtils.getParamenterMap() since the latter doesn't work with virtual URI
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation" })
@Override
protected void populateFromRequest(Object bean)
{
- RequestFormUtil requestFormUtil = new RequestFormUtil(this.getRequest());
Map<String, Object> parameters = new HashMap<String, Object>();
// FIX: use request.getParameterMap instead of requestFormUtils.getParamenterMap()
parameters.putAll(request.getParameterMap());
- parameters.putAll(requestFormUtil.getDocuments()); // handle uploaded files too
+ // handle uploaded files too
+ parameters.putAll(new info.magnolia.cms.util.RequestFormUtil(this.getRequest()).getDocuments());
try
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,12 +19,10 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ActivationManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.Subscriber;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
@@ -94,8 +92,7 @@
}
/**
- * Register the repository to get used for activation TODO - use an API for this? But same remark as above, the
- * component might not be ready yet.
+ * Register the repository to get used for activation.
*/
private void subscribeRepository(String repository) throws TaskExecutionException
{
@@ -108,13 +105,12 @@
try
{
Node subscriptionsNode = MgnlContext.getJCRSession(RepositoryConstants.CONFIG).getNode(
- sManager.getConfigPath() + "/" + subscriber.getName() + "/subscriptions");
+ "/server/activation/subscribers/" + subscriber.getName() + "/subscriptions");
Node newSubscription = subscriptionsNode.addNode(repository, MgnlNodeType.NT_CONTENTNODE);
newSubscription.setProperty("toURI", "/");
newSubscription.setProperty("repository", repository);
newSubscription.setProperty("fromURI", "/");
- // subscriptionsNode.save();
}
catch (RepositoryException re)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -77,12 +77,12 @@
try
{
Node mediatypenode = session.getNode(nodePath);
- String extensions = mediatypenode.getNodeData("extensions").getString();
+ String extensions = PropertyUtil.getString(mediatypenode, "extensions");
if (StringUtils.contains(extensions, this.extension))
{
List<String> exts = new ArrayList<String>(Arrays.asList(StringUtils.split(extensions, ",")));
exts.remove(this.extension);
- mediatypenode.setNodeData("extensions", StringUtils.join(exts, ","));
+ mediatypenode.setProperty("extensions", StringUtils.join(exts, ","));
}
}
catch (RepositoryException e)
@@ -93,12 +93,12 @@
try
{
Node mediatypenode = session.getNode(control);
- String extensions = mediatypenode.getNodeData("extensions").getString();
+ String extensions = PropertyUtil.getString(mediatypenode, "extensions");
if (StringUtils.contains(extensions, this.extension))
{
List<String> exts = new ArrayList<String>(Arrays.asList(StringUtils.split(extensions, ",")));
exts.remove(this.extension);
- mediatypenode.setNodeData("extensions", StringUtils.join(exts, ","));
+ mediatypenode.setProperty("extensions", StringUtils.join(exts, ","));
}
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -20,31 +20,25 @@
package net.sourceforge.openutils.mgnlmedia.media.tags.el;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.DefaultContent;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.i18n.I18nContentWrapper;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeMapWrapper;
import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeU...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-12 13:54:05
|
Revision: 4369
http://openutils.svn.sourceforge.net/openutils/?rev=4369&view=rev
Author: fgiust
Date: 2013-10-12 13:53:58 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
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/setup/TagCloudModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/ObservedManagerAdapter.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
import info.magnolia.cms.beans.config.ServerConfiguration;
import info.magnolia.cms.security.UserManager;
import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.Components;
import info.magnolia.voting.voters.AbstractBoolVoter;
import javax.servlet.http.HttpServletRequest;
@@ -193,7 +194,7 @@
if (!allowAdmin)
{
- if (ServerConfiguration.getInstance().isAdmin())
+ if (Components.getComponent(ServerConfiguration.class).isAdmin())
{
log.debug(logmessage, "on admin server");
return DONTCACHE;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,12 +20,14 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.util.DeprecationUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.util.ArrayList;
import java.util.Collections;
@@ -103,7 +105,7 @@
{
String ctx = MgnlContext.getContextPath();
boolean canEdit = NodeUtil.isGranted(
- MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ MgnlUtilsDeprecatedAdapters.getMainContent(),
Permission.SET);
StringBuilder out = new StringBuilder();
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -23,6 +23,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.io.IOException;
import java.util.ArrayList;
@@ -91,7 +92,7 @@
try
{
canEdit = NodeUtil.isGranted(
- MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ MgnlUtilsDeprecatedAdapters.getMainContent(),
Permission.SET);
}
@@ -104,7 +105,7 @@
Map<String, String> item = new HashMap<String, String>();
item.put("containerId", containerId);
item.put("url", MgnlContext.getContextPath() + "/mgnl-set-property");
- item.put("path", MgnlContext.getAggregationState().getCurrentContent().getHandle());
+ item.put("path", NodeUtil.getPathIfPossible(MgnlUtilsDeprecatedAdapters.getCurrentContent()));
item.put("name", orderProperty);
item.put("order", '[' + order + ']');
List items = (List) pageContext.getRequest().getAttribute(ContextMenuElFunctions.SORT_LIST_KEY);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -61,7 +61,7 @@
if (media != null)
{
PropertyUtil.setProperty(media, property, value);
- media.save();
+ media.getSession().save();
return true;
}
return false;
@@ -87,7 +87,7 @@
if (media != null && media.hasProperty(property))
{
media.getProperty(property).remove();
- media.save();
+ media.getSession().save();
return true;
}
return false;
@@ -243,7 +243,7 @@
MediaWithPreviewImageTypeHandler.PREVIEW_NODEDATA_NAME,
"preview",
null);
- media.save();
+ media.getSession().save();
return true;
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -4,6 +4,8 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
@@ -29,8 +31,8 @@
@Override
public void uploadVideo(final String mediaUUID) throws IOException, RepositoryException
{
- Content media = MgnlContext
- .getSystemContext()
+ Content media = Components
+ .getComponent(SystemContext.class)
.getHierarchyManager(MediaModule.REPO)
.getContentByUUID(mediaUUID);
NodeData file = media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,17 +19,18 @@
package net.sourceforge.openutils.mgnlmedia.grid;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
import java.io.StringWriter;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlcontrols.configuration.AbstractGridColumnType;
@@ -106,11 +107,17 @@
{
if (StringUtils.startsWith(column[index], "/"))
{
- Content node = ContentUtil.getContentByUUID(MediaModule.REPO, column[index]);
- if (node != null)
+ Node node;
+ try
{
- column[index] = node.getUUID();
+ node = NodeUtil.getNodeByIdentifier(MediaModule.REPO, column[index]);
+
+ column[index] = NodeUtil.getNodeIdentifierIfPossible(node);
}
+ catch (RepositoryException e)
+ {
+ // ignore, can't convert
+ }
}
}
}
@@ -130,11 +137,17 @@
{
if (StringUtils.startsWith(column[index], "/"))
{
- Content node = ContentUtil.getContentByUUID(MediaModule.REPO, column[index]);
- if (node != null)
+ Node node;
+ try
{
- column[index] = node.getUUID();
+ node = NodeUtil.getNodeByIdentifier(MediaModule.REPO, column[index]);
+
+ column[index] = NodeUtil.getNodeIdentifierIfPossible(node);
}
+ catch (RepositoryException e)
+ {
+ // ignore, can't convert
+ }
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -106,7 +106,7 @@
Criteria c = JCRCriteriaFactory
.createCriteria()
.setWorkspace(MediaModule.REPO)
- .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
+ .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.NT_MEDIA));
// media type
if (!StringUtils.isEmpty(mediaType))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.AlertUtil;
@@ -131,8 +132,8 @@
try
{
return !getRule().isAllowed(content.getNodeTypeName())
- && !ItemType.CONTENT.getSystemName().equals(content.getNodeTypeName())
- && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+ && !MgnlNodeType.NT_CONTENT.equals(content.getNodeTypeName())
+ && !MediaConfigurationManager.NT_RESOLUTIONS.equals(content.getNodeTypeName());
}
catch (RepositoryException e)
{
@@ -156,7 +157,7 @@
*/
protected void activateSingleNode(String parentPath, Content node) throws RepositoryException, ExchangeException
{
- if (MediaConfigurationManager.MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
+ if (MediaConfigurationManager.NT_MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
{
// already activated media, should deactivate in order to remove stale resolutions
log
@@ -196,7 +197,7 @@
{
log.info("Activating parent folder {}", folder.getHandle());
// folder only, no content
- setRule(new Rule(new String[]{ItemType.NT_METADATA, ItemType.NT_RESOURCE }));
+ setRule(new Rule(new String[]{MgnlNodeType.NT_METADATA, MgnlNodeType.NT_RESOURCE }));
getSyndicator().activate(folder.getParent().getHandle(), folder, getOrderingInfo(folder));
}
@@ -226,7 +227,7 @@
try
{
return !getRule().isAllowed(content.getNodeTypeName())
- && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+ && !MediaConfigurationManager.NT_RESOLUTIONS.equals(content.getNodeTypeName());
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -24,6 +24,7 @@
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
@@ -34,6 +35,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
@@ -80,17 +82,17 @@
/**
* Folder type
*/
- public static final ItemType FOLDER = ItemType.CONTENT;
+ public static final String NT_FOLDER = MgnlNodeType.NT_CONTENT;
/**
* Media type
*/
- public static final ItemType MEDIA = new ItemType(MGNL_MEDIA_TYPE);
+ public static final String NT_MEDIA = MGNL_MEDIA_TYPE;
/**
* Resolutions node type
*/
- public static final ItemType RESOLUTIONS = new ItemType(MGNL_RESOLUTION_TYPE);
+ public static final String NT_RESOLUTIONS = MGNL_RESOLUTION_TYPE;
private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
@@ -259,7 +261,7 @@
{
sbQuery.append('/');
}
- sbQuery.append("element(*," + MediaConfigurationManager.MEDIA.getSystemName() + ")");
+ sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
List<String> clauses = new ArrayList<String>();
if (StringUtils.isNotBlank(search))
{
@@ -317,7 +319,7 @@
*/
public String getURIMappingPrefix()
{
- Collection<URI2RepositoryMapping> mappings = URI2RepositoryManager.getInstance().getMappings();
+ Collection<URI2RepositoryMapping> mappings = Components.getComponent(URI2RepositoryManager.class).getMappings();
for (URI2RepositoryMapping mapping : mappings)
{
if (mapping.getRepository().equals(MediaModule.REPO))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collection;
@@ -57,12 +58,12 @@
* @version $Id$
*/
@Singleton
-public class MediaUsedInManager extends ObservedManager
+public class MediaUsedInManager extends ObservedManagerAdapter
{
public static MediaUsedInManager getInstance()
{
- return Components.getSingleton(MediaUsedInManager.class);
+ return Components.getComponents(MediaUsedInManager.class);
}
private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
@@ -82,9 +83,9 @@
* {@inheritDoc}
*/
@Override
- protected void onRegister(Content node)
+ protected void onRegister(Node node)
{
- Collection<Content> uiwNodes = node.getChildren(ItemType.CONTENTNODE);
+ Collection<Content> uiwNodes = node.getChildren(MgnlNodeType.NT_CONTENTNODE);
for (Content uiwNode : uiwNodes)
{
try
@@ -96,7 +97,7 @@
}
if (StringUtils.isEmpty(uiw.getNodeType()))
{
- uiw.setNodeType(ItemType.CONTENT.getSystemName());
+ uiw.setNodeType(MgnlNodeType.NT_CONTENT);
}
usedInWorkspaceMap.put(uiw.getWorkspaceName(), uiw);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,6 +20,7 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.repository.RepositoryConstants;
@@ -34,7 +35,7 @@
private String workspaceName;
- private String nodeType = ItemType.CONTENT.getSystemName();
+ private String nodeType = MgnlNodeType.NT_PAGE;
private String basePath = "/";
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -102,7 +102,7 @@
.append("|")
.append(y)
.toString());
- systemNode.save();
+ systemNode.getSession().save();
}
catch (RepositoryException ex)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author molaschi
* @version Id:
*/
+@SuppressWarnings("deprecation")
public class DialogFileAudio extends DialogFile
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author molaschi
* @version Id:
*/
+@SuppressWarnings("deprecation")
public class DialogFileImage extends DialogFile
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -37,6 +37,7 @@
* @author molaschi
* @version Id:
*/
+@SuppressWarnings("deprecation")
public class DialogFileVideo extends DialogFile
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author ADMIN
* @version $Id: $
*/
+@SuppressWarnings("deprecation")
public class DialogHiddenParameters extends ConfigurableFreemarkerDialog
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -32,6 +32,7 @@
* @author fgiust
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DialogMetadata extends DialogStatic
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -56,6 +56,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DialogSelectMedia extends ConfigurableFreemarkerDialog
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -26,6 +26,7 @@
* @author fgiust
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DisplayHandle extends DialogStatic
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -26,6 +26,7 @@
* @author cstrappazzon
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class DisplayUUID extends DialogStatic
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -50,6 +50,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class LayerDialogMVC extends ConfiguredDialog
{
@@ -134,7 +135,7 @@
{
super.configureSaveHandler(saveHandler);
- saveHandler.setCreationItemType(MediaConfigurationManager.MEDIA);
+ saveHandler.setCreationItemType(MediaConfigurationManager.NT_MEDIA);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -25,6 +25,7 @@
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import java.util.List;
@@ -108,7 +109,7 @@
String repository = entry.getKey();
for (String handle : entry.getValue())
{
- String uri = URI2RepositoryManager.getInstance().getURI(repository, handle);
+ String uri = Components.getComponent(URI2RepositoryManager.class).getURI(repository, handle);
mb.getUsedInUris().add(uri);
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.ExchangeException;
@@ -441,14 +442,14 @@
@SuppressWarnings("unchecked")
public String activate()
{
- Command cmd = CommandsManager.getInstance().getCommand("media", "activate");
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand("media", "activate");
ActivationCommand actCmd = (ActivationCommand) cmd;
StringBuffer sb = new StringBuffer();
- sb.append(MediaConfigurationManager.MEDIA.getSystemName());
+ sb.append(MediaConfigurationManager.NT_MEDIA);
sb.append(",");
- sb.append(ItemType.CONTENTNODE.getSystemName());
+ sb.append(MgnlNodeType.NT_CONTENTNODE);
actCmd.setItemTypes(sb.toString());
Context context = MgnlContext.getInstance();
@@ -477,7 +478,7 @@
@SuppressWarnings("unchecked")
public String deactivate()
{
- Command cmd = CommandsManager.getInstance().getCommand("media", "deactivate");
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand("media", "deactivate");
Context context = MgnlContext.getInstance();
context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -97,7 +97,7 @@
Session session = MgnlContext.getJCRSession(MediaModule.REPO);
Iterable<Node> nodes = NodeUtil.getNodes(
session.getRootNode(),
- MediaConfigurationManager.FOLDER.getSystemName());
+ MediaConfigurationManager.NT_FOLDER);
List<String> tmpPaths = new ArrayList<String>();
for (Node c : nodes)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -42,6 +42,7 @@
* @author ADMIN
* @version $Id: $
*/
+@SuppressWarnings("deprecation")
public class HiddenParametersSaveHandler implements FieldSaveHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -49,6 +49,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class MediaCustomSaveHandler implements FieldSaveHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,16 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import java.util.Collection;
-
+import javax.jcr.Node;
+import javax.jcr.Property;
import javax.jcr.RepositoryException;
import org.slf4j.Logger;
@@ -62,22 +60,25 @@
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- Content types = installContext.getConfigHierarchyManager().getContent("/modules/media/mediatypes");
- Collection<Content> mediatypes = types.getChildren(ItemType.CONTENTNODE);
+ Node types = installContext.getConfigJCRSession().getNode("/modules/media/mediatypes");
+
+ Iterable<Node> mediatypes = NodeUtil.getNodes(types, MgnlNodeType.NT_CONTENTNODE);
String handlerPropertyName = "handler";
- for (Content mediatype : mediatypes)
+ for (Node mediatype : mediatypes)
{
- if (mediatype.hasNodeData(handlerPropertyName))
+ if (mediatype.hasProperty(handlerPropertyName))
{
log.info("Legacy configuration found for mediatype {}", mediatype.getName()
+ ", updating configuration");
- NodeData handlerNd = mediatype.getNodeData(handlerPropertyName);
+
+ Property handlerNd = mediatype.getProperty(handlerPropertyName);
String previousHandler = handlerNd.getString();
- handlerNd.delete();
- if (!mediatype.hasContent(handlerPropertyName))
+ handlerNd.remove();
+
+ if (!mediatype.hasNode(handlerPropertyName))
{
- mediatype.createContent(handlerPropertyName, ItemType.CONTENTNODE).createNodeData(
+ mediatype.addNode(handlerPropertyName, MgnlNodeType.NT_CONTENTNODE).setProperty(
"class",
previousHandler);
}
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -1,128 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-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.mgnlmedia.media.setup;
-
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.Task;
-import info.magnolia.module.delta.TaskExecutionException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.DirectJcrQuery;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class MoveOriginalNodeTask implements Task
-{
-
- /**
- * Logger.
- */
- private static Logger log = LoggerFactory.getLogger(MoveOriginalNodeTask.class);
-
- public String getName()
- {
- return "file store nodedata name updater";
- }
-
- public String getDescription()
- {
- return "update custom nodedata names (where original files are stored) to \"original\"";
- }
-
- public void execute(InstallContext installContext) throws TaskExecutionException
- {
- try
- {
- Session session = installContext.getJCRSession(MediaModule.REPO);
- reset(session, "image", "image");
- reset(session, "video", "video");
- reset(session, "audio", "audio");
- }
- catch (RepositoryException ex)
- {
- log.error(ex.getMessage(), ex);
- }
- }
-
- public static void execute() throws RepositoryException
- {
- Session session = MgnlContext.getJCRSession(MediaModule.REPO);
-
- reset(session, "image", "image");
- reset(session, "video", "video");
- reset(session, "audio", "audio");
- }
-
- public static void reset(Session session, String type, String nodedataOldName) throws RepositoryException
- {
-
- DirectJcrQuery query = JCRCriteriaFactory.createDirectJcrQuery(session, "//*[@jcr:primaryType = '"
- + MediaConfigurationManager.MEDIA.getSystemName()
- + "' and "
- + nodedataOldName
- + " and @type='"
- + type
- + "']", Query.XPATH);
-
- AdvancedResult result = query.execute();
-
- ResultIterator<AdvancedResultItem> items = result.getItems();
-
- while (items.hasNext())
- {
- AdvancedResultItem media = items.next();
-
- if (media.hasProperty(nodedataOldName))
- {
- try
- {
- // it's a binary nodedata -> node
- session.getWorkspace().move(
- media.getPath() + "/" + nodedataOldName,
- media.getPath() + "/" + BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- }
- catch (RepositoryException e)
- {
- log.warn(
- "Unable to move node from {} to {}",
- media.getPath() + "/" + nodedataOldName,
- media.getPath() + "/" + BaseTypeHandler.ORGINAL_NODEDATA_NAME);
- }
- }
- }
- }
-}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,8 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -31,7 +29,9 @@
import java.util.Arrays;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.lang.StringUtils;
@@ -71,12 +71,12 @@
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- final HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.CONFIG);
+ Session session = ctx.getJCRSession(RepositoryConstants.CONFIG);
String nodePath = "/modules/media/mediatypes/" + this.mediatype;
try
{
- final Content mediatypenode = hm.getContent(nodePath);
+ Node mediatypenode = session.getNode(nodePath);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (StringUtils.contains(extensions, this.extension))
{
@@ -92,7 +92,7 @@
try
{
- final Content mediatypenode = hm.getContent(control);
+ Node mediatypenode = session.getNode(control);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (StringUtils.contains(extensions, this.extension))
{
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -1,84 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-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.mgnlmedia.media.setup;
-
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.AbstractTask;
-import info.magnolia.module.delta.TaskExecutionException;
-
-import java.util.Collection;
-
-import javax.jcr.RepositoryException;
-
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-
-
-/**
- * @author molaschi
- * @version $Id$
- */
-public class RemoveResolutionsNodeTask extends AbstractTask
-{
-
- /**
- * Constructor
- */
- public RemoveResolutionsNodeTask()
- {
- super("Remove resolutions nodes", "Remove resolutions nodes which type is not mgnl:resolutions");
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public void execute(InstallContext installContext) throws TaskExecutionException
- {
- HierarchyManager hm = installContext.getHierarchyManager(MediaModule.REPO);
- QueryManager mgr = hm.getQueryManager();
- try
- {
- Query query = mgr.createQuery("//resolutions", Query.XPATH);
- QueryResult result = query.execute();
- Collection<Content> resolutions = result.getContent(ItemType.CONTENTNODE.getSystemName());
- for (Content node : resolutions)
- {
- if (!node.isNodeType(MediaConfigurationManager.RESOLUTIONS.getSystemName()))
- {
- hm.delete(node.getHandle());
- }
- }
- hm.save();
- }
- catch (RepositoryException ex)
- {
- throw new TaskExecutionException(ex.getMessage(), ex);
- }
- }
-
-}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import java.io.InputStream;
-
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.NodeUtil;
@@ -28,15 +26,14 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import java.io.InputStream;
+
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
-import org.apache.jackrabbit.value.BinaryValue;
-
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -45,7 +42,11 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import org.apache.jackrabbit.value.BinaryValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @author molaschi
* @version $Id$
@@ -54,6 +55,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(RenameThumbToImageTask.class);
+
+ /**
* Constructor
*/
public RenameThumbToImageTask()
@@ -73,7 +79,7 @@
Session hm = installContext.getJCRSession(MediaModule.REPO);
Criteria criteria = JCRCriteriaFactory
.createCriteria()
- .setWorkspace(MediaConfigurationManager.MEDIA.getSystemName())
+ .setWorkspace(MediaConfigurationManager.NT_MEDIA)
.setBasePath("//*")
// .add(Restrictions.eq("jcr:primaryType", "mgnl:contentNode"))
.addOrder(Order.desc("@jcr:score"));
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -130,11 +130,11 @@
if (currentpage == null)
{
- currentpage = new DefaultContent(node);
+ currentpage = ContentUtil.asContent(node);
}
Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(node)),
+ new I18nContentWrapper(ContentUtil.asContent(node)),
currentpage.getHandle());
return content.getJCRNode();
}
@@ -566,7 +566,7 @@
*/
public Node apply(MediaNodeAndEntryPath from)
{
- return (Node) from.getMediaNode();
+ return from.getMediaNode();
}
});
return Iterators.filter(iter, Predicates.notNull());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -39,6 +39,7 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class JcrBrowserWithNodeTypeTreeConfiguration extends JcrBrowserTreeConfiguration
{
@@ -54,8 +55,8 @@
tree.getItemTypes().clear();
tree.addItemType(ItemType.CONTENT);
- tree.addItemType(MediaConfigurationMan...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-10 16:03:35
|
Revision: 4368
http://openutils.svn.sourceforge.net/openutils/?rev=4368&view=rev
Author: fgiust
Date: 2013-10-10 16:03:33 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-10 16:03:24 UTC (rev 4367)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-10 16:03:33 UTC (rev 4368)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.4</version>
+ <version>4.5.5-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.4</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.4</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.4</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-10 16:03:27
|
Revision: 4367
http://openutils.svn.sourceforge.net/openutils/?rev=4367&view=rev
Author: fgiust
Date: 2013-10-10 16:03:24 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcontextmenu-4.5.4
Added Paths:
-----------
tags/openutils-mgnlcontextmenu-4.5.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-10 16:03:18
|
Revision: 4366
http://openutils.svn.sourceforge.net/openutils/?rev=4366&view=rev
Author: fgiust
Date: 2013-10-10 16:03:14 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcontextmenu-4.5.4
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-10 15:40:29 UTC (rev 4365)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-10-10 16:03:14 UTC (rev 4366)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.4</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.4</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.4</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|