Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4128] magnoliamodules/trunk
|
From: <fg...@us...> - 2012-10-31 16:04:26
|
Revision: 4128
http://openutils.svn.sourceforge.net/openutils/?rev=4128&view=rev
Author: fgiust
Date: 2012-10-31 16:04:15 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Merged revisions 4104-4110,4112-4116,4121-4123 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r4104 | diego_schivo | 2012-07-17 18:11:00 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-18 Add unit-test for RepositoryMessagesImpl
........
r4105 | diego_schivo | 2012-07-17 18:55:29 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-19 RepositoryMessagesImplTest.testFixIllegalArgumentExceptionOnJackrabbit2_4_1()
........
r4106 | diego_schivo | 2012-07-17 18:56:01 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-19 RepositoryMessagesImpl fix
........
r4107 | diego_schivo | 2012-07-18 15:38:26 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 Grid: add the possibility to store editcode columns into binary properties
........
r4108 | diego_schivo | 2012-07-18 16:34:39 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 fileNodeName
........
r4109 | diego_schivo | 2012-07-18 17:17:12 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 EditCodeGridColumnType: escapeEditCodeGridColumnValue, unescapeEditCodeGridColumnValue
........
r4110 | diego_schivo | 2012-07-18 17:28:52 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 grid-editcode.html: '
........
r4112 | diego_schivo | 2012-08-20 11:41:28 +0200 (Mon, 20 Aug 2012) | 1 line
CONTROLS-52: UUIDLinkField.js
........
r4113 | diego_schivo | 2012-08-20 12:21:41 +0200 (Mon, 20 Aug 2012) | 1 line
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
........
r4114 | diego_schivo | 2012-08-23 17:55:12 +0200 (Thu, 23 Aug 2012) | 1 line
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
........
r4115 | diego_schivo | 2012-09-28 18:16:33 +0200 (Fri, 28 Sep 2012) | 1 line
TAGCLOUD-19 tagcloud.tld: java.util.Map
........
r4116 | fgiust | 2012-10-05 17:37:55 +0200 (Fri, 05 Oct 2012) | 1 line
upgrade to lucene 3
........
r4121 | fgiust | 2012-10-31 15:04:49 +0100 (Wed, 31 Oct 2012) | 1 line
fix "repositories" property
........
r4122 | fgiust | 2012-10-31 15:15:59 +0100 (Wed, 31 Oct 2012) | 1 line
fix logo using new media APIs
........
r4123 | fgiust | 2012-10-31 15:19:51 +0100 (Wed, 31 Oct 2012) | 1 line
compile fix
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4104&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4105&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4106&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4107&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4108&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4109&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4110&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4112&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4113&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4114&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4115&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4116&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4121&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4122&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4123&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/msg-bootstrap/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/msg-repository/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001,4055-4065
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001-4035,4037-4050,4053,4055-4065,4067,4069-4127
Modified: svn:mergeinfo
- /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065,4104-4123
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -85,7 +85,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
}
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -47,7 +48,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/CheckColumn.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/CheckColumn.js\"></script>";
}
/**
@@ -83,7 +86,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
// TODO Auto-generated method stub
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/ColorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/ColorField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -46,9 +47,12 @@
StringBuilder result = new StringBuilder(super.getHeadSnippet());
result.append("<script type=\"text/javascript\" src=\"");
result.append(MgnlContext.getContextPath());
- result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
+ result.append("/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/PipeComboBox.js\"></script>");
// Combobox must be patched because of a bug. For reference, see:
// http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
+ result.append("<script type=\"text/javascript\">");
result.append("var PatchedComboBox = Ext.extend(Ext.form.ComboBox, {");
result.append(" setValue: function(v) {");
result.append(" this.store.clearFilter();");
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -19,12 +19,36 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
+import info.magnolia.cms.beans.runtime.Document;
+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.Path;
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.module.ModuleRegistry;
+import info.magnolia.module.admininterface.SaveHandlerImpl;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
+import javax.jcr.RepositoryException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.safehaus.uuid.UUIDGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* @author diego
* @version $Id: $
@@ -32,6 +56,18 @@
public class EditCodeGridColumnType extends AbstractGridColumnType
{
+ public static String escapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.escapeJava(StringEscapeUtils.escapeXml(value));
+ }
+
+ public static String unescapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.unescapeXml(StringEscapeUtils.unescapeJava(value));
+ }
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
/**
* {@inheritDoc}
*/
@@ -40,13 +76,122 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/EditCodeField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/EditCodeField.js\"></script>";
}
/**
* {@inheritDoc}
*/
@Override
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ HierarchyManager hm = storageNode.getHierarchyManager();
+ for (int index = 0; index < column.length; index++)
+ {
+ String value = StringUtils.EMPTY;
+ String link = StringUtils.trim(column[index]);
+ if (StringUtils.isNotBlank(link))
+ {
+ NodeData nodeData = null;
+ try
+ {
+ nodeData = hm.getNodeData(storageNode.getHandle()
+ + "/"
+ + StringUtils.substringBeforeLast(link, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ if (nodeData != null)
+ {
+ try
+ {
+ value = escapeEditCodeGridColumnValue(StringUtils.join(
+ IOUtils.readLines(nodeData.getStream(), "UTF-8"),
+ '\n'));
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ column[index] = value;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ throws RepositoryException, AccessDeniedException
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ String filename = NodeDataUtil.getString(colConfig, "binaryFilename", "file.txt");
+ String type = NodeDataUtil.getString(colConfig, "binaryType", "text/plain");
+ HierarchyManager hm = parentNode.getHierarchyManager();
+ Content filesNode = ContentUtil.getOrCreateContent(parentNode, propertyName
+ + "_"
+ + colConfig.getName()
+ + "_files", ItemType.CONTENTNODE);
+
+ for (Iterator<NodeData> iter = filesNode.getNodeDataCollection().iterator(); iter.hasNext();)
+ {
+ NodeData fileNodeData = iter.next();
+ fileNodeData.delete();
+ }
+
+ String uuid = UUIDGenerator.getInstance().generateTimeBasedUUID().toString();
+ File tmpDir = new File(Path.getTempDirectoryPath() + "/fckeditor/" + uuid);
+ for (int index = 0; index < column.length; index++)
+ {
+ if (StringUtils.isEmpty(column[index]))
+ {
+ continue;
+ }
+ File tmpFile = new File(tmpDir, filename);
+ try
+ {
+ FileUtils.writeStringToFile(tmpFile, unescapeEditCodeGridColumnValue(column[index]), "UTF-8");
+ }
+ catch (IOException e)
+ {
+ log.error("can't write to tmp file [" + tmpFile + "]");
+ }
+ Document doc = new Document(tmpFile, type);
+ String fileNodeName = Path.getUniqueLabel(
+ hm,
+ filesNode.getHandle(),
+ String.valueOf(System.currentTimeMillis()));
+ SaveHandlerImpl.saveDocument(filesNode, doc, fileNodeName, "", "");
+ String link = filesNode.getName() + "/" + fileNodeName + "/" + doc.getFileNameWithExtension();
+ column[index] = link;
+ doc.delete();
+ }
+ try
+ {
+ FileUtils.deleteDirectory(new java.io.File(Path.getTempDirectory() + "/fckeditor/" + uuid));
+ }
+ catch (IOException e)
+ {
+ log.error("can't delete tmp file [" + Path.getTempDirectory() + "/fckeditor/" + uuid + "]");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap,
Messages msgs)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FckEditorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FckEditorField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -30,6 +30,7 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.IOException;
@@ -64,7 +65,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FileField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FileField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -67,8 +67,10 @@
* Possibly transforms the column values on grid load.
* @param column
* @param colConfig
+ * @param propertyName
+ * @param storageNode
*/
- public void processColumnOnLoad(String[] column, Content colConfig);
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode);
/**
* Possibly transforms the column values on grid save.
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +46,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/LinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/LinkField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -25,6 +25,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
@@ -52,7 +53,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/UUIDLinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/UUIDLinkField.js\"></script>";
}
/**
@@ -82,7 +85,7 @@
* {@inheritDoc}
*/
@Override
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -105,7 +105,7 @@
GridColumnType colType = colTypeMap.get(colTypeName);
if (colType != null)
{
- colType.processColumnOnLoad(column, colConfig);
+ colType.processColumnOnLoad(column, colConfig, getName(), getStorageNode());
}
}
colIndex++;
Copied: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (from rev 4123, magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="jsversion" 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:uuid" sv:type="String">
+ <sv:value>e17ff712-3a80-425e-aa30-c3f90975385c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/\.resources/controls/[^/]+/js/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>/.resources/controls/js/$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:Data" sv:type="String">
+ <sv:value>MetaData</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="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-08-20T12:16:53.943+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-10-31 16:04:15 UTC (rev 4128)
@@ -23,7 +23,7 @@
<script type="text/javascript">
var editor;
MgnlDHTMLUtil.addOnLoad(function(){
- document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
+ document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/'/g, "\'").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
switch(c){
case "\\":
return "\\";
@@ -52,7 +52,7 @@
});
});
function getValue() {
- return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+ return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
}
</script>
</head>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-10-31 16:04:15 UTC (rev 4128)
@@ -1,2 +1,14 @@
-var UUIDLinkField = Ext.extend(LinkField, {
+var UUIDLinkField = Ext.extend(Ext.form.TriggerField, {
+
+ triggerClass : 'x-form-link-trigger',
+
+ repository: 'website',
+
+ // extension: undefined,
+
+ onTriggerClick : function() {
+ if (this.disabled) return;
+ mgnlDialogLinkOpenBrowser(this.el.id, this.repository, this.extension);
+ }
+
});
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -85,7 +85,7 @@
* @param handle
* @return
*/
- private String cleanHandle(String handle)
+ protected String cleanHandle(String handle)
{
if (!handle.startsWith("/"))
{
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -15,7 +15,7 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="repository" sv:type="String">
+ <sv:property sv:name="repositories" sv:type="String">
<sv:value>email</sv:value>
</sv:property>
<sv:property sv:name="templatePath" sv:type="String">
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 16:04:15 UTC (rev 4128)
@@ -13,7 +13,7 @@
<tbody>
<tr>
<td height="101" align="center" bgcolor="#102942" style="color: #fff">
- <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(media.node(content.logo))} [/#if]</a>
+ <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(content.logo)} [/#if]</a>
${content.title!}
</td>
</tr>
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 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -112,6 +112,12 @@
{
return "???" + key + "???";
}
+ catch (IllegalArgumentException e)
+ {
+ // MESSAGES-19 Uncaught IllegalArgumentException using jackrabbit 2.4.1
+ // at org.apache.jackrabbit.core.id.NodeId.<init>(NodeId.java:129)
+ return "???" + key + "???";
+ }
}
/**
Copied: magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (from rev 4123, magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties 2012-10-31 16:04:15 UTC (rev 4128)
@@ -0,0 +1,41 @@
+magnolia.basedir=target/magnolia-test-data
+magnolia.cache.startdir=${magnolia.basedir}/cache
+magnolia.upload.tmpdir=${magnolia.basedir}/tmp
+magnolia.exchange.history=${magnolia.basedir}/history
+
+magnolia.app.rootdir=.
+
+magnolia.repositories.home=target/test-repositories
+# points to the classpath resources, but will be extracted and the property reset
+
+magnolia.repositories.config=/test-repositories.xml
+magnolia.repositories.jackrabbit.config=/jackrabbit-test-configuration.xml
+
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.logs.dir=${magnolia.base}/logs
+
+# The directories in which the bootstrap files are searched
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
+
+
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=false
+magnolia.develop=true
+
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+magnolia.update.auto=true
+
+magnolia.defaultpage = /sapere.html
+
+####### solo per test #####
+info.magnolia.logging.AuditLoggingManager=info.magnolia.logging.AuditLoggingManager
+info.magnolia.link.LinkTransformerManager=info.magnolia.link.LinkTransformerManager
+#######
+
+info.magnolia.cms.i18n.I18nContentSupport=info.magnolia.cms.i18n.DefaultI18nContentSupport
+
+info.magnolia.cms.core.search.SearchFactory=info.magnolia.cms.core.search.DefaultSearchFactory
+
+info.magnolia.cms.i18n.MessagesManager=net.sourceforge.openutils.mgnlmessages.i18n.MultiBundleMgnlMessagesManager
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -48,7 +48,7 @@
*/
protected HierarchyBoboIndexReader(
IndexReader indexReader,
- Collection<FacetHandler<?>> facetHandlers,
+ Collection<FacetHandler< ? >> facetHandlers,
WorkArea workArea) throws IOException
{
super(indexReader, facetHandlers, null, workArea, false);
@@ -62,7 +62,7 @@
* @return wrapped Bobo index reader instance
* @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler<?>> facetHandlers)
+ public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
throws IOException
{
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-10-31 16:04:15 UTC (rev 4128)
@@ -174,7 +174,7 @@
<description>Get a tag cloud configured in adminCentral (which caches values and updates on repository operations)</description>
<name>named</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map named(java.lang.String)</function-signature>
+ <function-signature>java.util.Map named(java.lang.String)</function-signature>
<example>
<