Menu
▾
▴
openutils-svn — developer list with svn commits
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
|
Revision: 4315
http://openutils.svn.sourceforge.net/openutils/?rev=4315&view=rev
Author: lucaboati
Date: 2013-09-16 10:55:46 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
contextmenu-jquery.js added
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
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-09-15 20:34:53 UTC (rev 4314)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-16 10:55:46 UTC (rev 4315)
@@ -83,7 +83,10 @@
+ ctx
+ "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n");
+ out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
out.append("<!-- end contextmenu:links -->\n");
+
+
}
return out.toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 20:34:57
|
Revision: 4314
http://openutils.svn.sourceforge.net/openutils/?rev=4314&view=rev
Author: fgiust
Date: 2013-09-15 20:34:53 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
rimosse funzioni deprecate
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
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-09-15 19:39:07 UTC (rev 4313)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-15 20:34:53 UTC (rev 4314)
@@ -579,272 +579,6 @@
return url;
}
- //
- //
- // DEPRECATED FUNCTION
- //
- //
-
- /**
- * @deprecated, use node(Object)
- */
- @Deprecated
- public static Content getNode(Object obj)
- {
- log.warn("\"getNode()\" has been deprecated, please use \"node()\"");
- return node(obj);
- }
-
- /**
- * @deprecated, use descLoc(Content, Locale)
- */
- @Deprecated
- public static String getDescription(Content media, Locale locale)
- {
- log.warn("\"getDescription()\" has been deprecated, please use \"descLoc()\"");
- return descLoc(media, locale);
- }
-
- /**
- * @deprecated, use desc(Content)
- */
- @Deprecated
- public static String getDescription(Content media)
- {
- log.warn("\"getDescription()\" has been deprecated, please use \"desc()\"");
- return desc(media);
- }
-
- /**
- * @deprecated, use titleLoc(Content, Locale)
- */
- @Deprecated
- public static String getTitle(Content media, Locale locale)
- {
- log.warn("\"getTitle()\" has been deprecated, please use \"titleLoc()\"");
- return titleLoc(media, locale);
- }
-
- /**
- * @deprecated, use title(Content)
- */
- @Deprecated
- public static String getTitle(Content media)
- {
- log.warn("\"getTitle()\" has been deprecated, please use \"title()\"");
- return title(media);
- }
-
- /**
- * @deprecated, use url(Content)
- */
- @Deprecated
- public static String getUrl(Content media)
- {
- log.warn("\"getUrl()\" has been deprecated, please use \"url()\"");
- return url(media);
- }
-
- /**
- * @deprecated, use urlParams(Content, Map)
- */
- @Deprecated
- public static String getUrl2(Content media, Map<String, String> options)
- {
- log.warn("\"url2()\" has been deprecated, please use \"urlParams()\"");
- return urlParams(media, options);
- }
-
- /**
- * @deprecated, use urlres(Content, String)
- */
- @Deprecated
- public static String getResolutionUrl(Content media, String resolution)
- {
- log.warn("\"getResolutionUrl()\" has been deprecated, please use \"urlres()\"");
- return urlres(media, resolution);
- }
-
- /**
- * @deprecated, use resolutions(Content)
- */
- @Deprecated
- public static String[] listResolutions(Content media)
- {
- log.warn("\"listResolutions()\" has been deprecated, please use \"resolutions()\"");
- return resolutions(media);
- }
-
- /**
- * @deprecated, use thumbnail(Content)
- */
- @Deprecated
- public static String getThumbnail(Content media)
- {
- log.warn("\"getThumbnail()\" has been deprecated, please use \"thumbnail()\"");
- return thumbnail(media);
- }
-
- /**
- * @deprecated, use preview(Content)
- */
- @Deprecated
- public static String getPreview(Content media)
- {
- log.warn("\"getPreview()\" has been deprecated, please use \"preview()\"");
- return preview(media);
- }
-
- /**
- * @deprecated, use type(Content)
- */
- @Deprecated
- public static String getType(Content media)
- {
- log.warn("\"getType()\" has been deprecated, please use \"type()\"");
- return type(media);
- }
-
- /**
- * @deprecated, use size(Content, String)
- */
- @Deprecated
- public static int[] getSize(Content media, String resolution)
- {
- log.warn("\"getSize()\" has been deprecated, please use \"size()\"");
- return size(media, resolution);
- }
-
- /**
- * @deprecated, use usedInWebPages(Content)
- */
- @Deprecated
- public static String[] findMediaUsedInWebPages(Content media)
- {
- log.warn("\"findMediaUsedInWebPages()\" has been deprecated, please use \"usedInWebPages()\"");
- return usedInWebPages(media);
- }
-
- /**
- * @deprecated, use ${media.description} in templates
- */
- @Deprecated
- public static String descLoc(Content media, Locale locale)
- {
- log.warn("\"descLoc()\" has been deprecated, please check javadocs");
-
- if (media == null)
- {
- return null;
- }
- if (locale != null)
- {
- MgnlContext.setLocale(locale);
- }
- MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- if (mtc == null || mtc.getHandler() == null)
- {
- return null;
- }
- return mtc.getHandler().getDescription(media);
- }
-
- /**
- * @deprecated, use ${media.title} in templates
- */
- @Deprecated
- public static String titleLoc(Content media, Locale locale)
- {
- log.warn("\"titleLoc()\" has been deprecated, please check javadocs");
-
- if (media == null)
- {
- return null;
- }
- if (locale != null)
- {
- MgnlContext.setLocale(locale);
- }
- MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- if (mtc == null || mtc.getHandler() == null)
- {
- return null;
- }
- return mtc.getHandler().getTitle(media);
- }
-
- /**
- * @deprecated, use ${media.tags} in templates
- */
- @Deprecated
- public static String[] tagsLoc(Content media, Locale locale)
- {
- log.warn("\"tagsLoc()\" has been deprecated, please check javadocs");
-
- if (media == null)
- {
- return null;
- }
- if (locale != null)
- {
- MgnlContext.setLocale(locale);
- }
- MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- if (mtc == null || mtc.getHandler() == null)
- {
- return null;
- }
- String tags = mtc.getHandler().getTags(media);
- if (tags == null)
- {
- return null;
-
- }
- return StringUtils.split(tags, ",");
- }
-
- /**
- * Get description for a media for the current locale.
- * @param media media
- * @return description
- * @deprecated use media.getNodeData("description") or ${media.description}
- */
- @Deprecated
- public static String desc(Content media)
- {
- log.warn("\"desc()\" has been deprecated, please check javadocs");
-
- return descLoc(media, null);
- }
-
- /**
- * Get title for a media for the current locale.
- * @param media media
- * @return title
- * @deprecated use media.getNodeData("title") or ${media.title}
- */
- @Deprecated
- public static String title(Content media)
- {
- log.warn("\"title()\" has been deprecated, please check javadocs");
-
- return titleLoc(media, null);
- }
-
- /**
- * Get tags for a media
- * @param media media
- * @return tags
- * @deprecated use media.getNodeData("tags") or ${media.tags}
- */
- @Deprecated
- public static String[] tags(Content media)
- {
- log.warn("\"tags()\" has been deprecated, please check javadocs");
-
- return tagsLoc(media, null);
- }
-
private static String appendBaseUrl(String url)
{
String baseurl = module().getBaseurl();
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-15 19:39:07 UTC (rev 4313)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-15 20:34:53 UTC (rev 4314)
@@ -78,88 +78,6 @@
</example>
</function>
<function>
- <description>Get the description from a media, given the media node itself.</description>
- <display-name>desc</display-name>
- <name>desc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String desc(info.magnolia.cms.core.Content)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:desc(mediaNode)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the description from a media, given the media node itself and a locale. Try to get the value from nodedata "description-{locale}"; if not found get the value from "description-en"; if not found again, get the value from "description".</description>
- <display-name>descLoc</display-name>
- <name>descLoc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String descLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:descLoc(mediaNode, pageContext.request.locale)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the title from a media, given the media node itself.</description>
- <display-name>title</display-name>
- <name>title</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String title(info.magnolia.cms.core.Content)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:title(mediaNode)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the title from a media, given the media node itself and a locale. Try to get the value from nodedata "title-{locale}"; if not found get the value from "title-en"; if not found again, get the value from "title".</description>
- <display-name>titleLoc</display-name>
- <name>titleLoc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String titleLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:out value="${media:titleLoc(mediaNode, pageContext.request.locale)}" />
- ]]>
- </example>
- </function>
- <function>
- <description>Get the tags from a media, given the media node itself.</description>
- <display-name>tags</display-name>
- <name>tags</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String[] tags(info.magnolia.cms.core.Content)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:forEach var="tag" items="${media:tags(mediaNode)}">
- <c:out value="${tag}" />
- </c:forEach>
- ]]>
- </example>
- </function>
- <function>
- <description>Get the tags from a media, given the media node itself and a locale. Try to get the value from nodedata "tags-{locale}"; if not found get the value from "tags-en"; if not found again, get the value from "tags".</description>
- <display-name>tagsLoc</display-name>
- <name>tagsLoc</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String[] tagsLoc(info.magnolia.cms.core.Content, java.util.Locale)</function-signature>
- <example>
- <![CDATA[
- <c:set var="mediaNode" value="${media:node(content.image)}" />
- <c:forEach var="tag" items="${media:tagsLoc(mediaNode, pageContext.request.locale)}">
- <c:out value="${tag}" />
- </c:forEach>
- ]]>
- </example>
- </function>
- <function>
<description>Get the url to the media, given the media node itself or its UUID</description>
<display-name>url</display-name>
<name>url</name>
@@ -173,15 +91,8 @@
</example>
</function>
<function>
- <description>@deprecated use urlParams()</description>
- <display-name>url2</display-name>
- <name>url2</name>
- <function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>java.lang.String getUrl2(info.magnolia.cms.core.Content, java.util.Map)</function-signature>
- </function>
- <function>
<description>Get the url to the media, given the media node itself or its UUID and a Map of options</description>
- <display-name>url2</display-name>
+ <display-name>urlParams</display-name>
<name>urlParams</name>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String urlParams(java.lang.Object, java.util.Map)</function-signature>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4313
http://openutils.svn.sourceforge.net/openutils/?rev=4313&view=rev
Author: fgiust
Date: 2013-09-15 19:39:07 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
form layout
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-15 19:17:52 UTC (rev 4312)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-15 19:39:07 UTC (rev 4313)
@@ -14,117 +14,106 @@
<br />
<div class="testcontent clearfix">
<p>Tab or click through the fields to reveal the hints.</p>
- <dl>
- <!-- FIRST NAME -->
- <dt>
- <label for="firstname">
+ <form class="form form-horizontal" action="">
+ <div class="form-group">
+ <label class="col-lg-2 control-label" for="firstname">
<contextmenu:element name="firstname" menu="samples-form-label">First Name:</contextmenu:element>
</label>
- </dt>
- <dd>
- <input name="firstname" id="firstname" type="text" />
- <!-- This is the name your mama called you when you were little. -->
- <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'firstname-hint')}" />
- <c:if test="${not empty hint}">
- <span class="hint">
+ <div class="col-lg-10">
+ <input name="firstname" id="firstname" type="text" />
+ <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'firstname-hint')}" />
+ <c:if test="${not empty hint}">
+ <span class="hint">
<![CDATA[${hint}<span class="hint-pointer"> </span>]]>
- </span>
- </c:if>
- </dd>
- <!-- LAST NAME -->
- <dt>
- <label for="lastname">
+ </span>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-2 control-label" for="lastname">
<contextmenu:element name="lastname" menu="samples-form-label">Last Name:</contextmenu:element>
</label>
- </dt>
- <dd>
- <input name="lastname" id="lastname" type="text" />
- <!-- This is the name your sergeant called you when you went through bootcamp. -->
- <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'lastname-hint')}" />
- <c:if test="${not empty hint}">
- <span class="hint">
+ <div class="col-lg-10">
+ <input name="lastname" id="lastname" type="text" />
+ <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'lastname-hint')}" />
+ <c:if test="${not empty hint}">
+ <span class="hint">
<![CDATA[${hint}<span class="hint-pointer"> </span>]]>
- </span>
- </c:if>
- </dd>
- <!-- EMAIL -->
- <dt>
- <label for="email">
+ </span>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-2 control-label" for="email">
<contextmenu:element name="email" menu="samples-form-label">Email:</contextmenu:element>
</label>
- </dt>
- <dd>
- <input name="email" id="email" type="text" />
- <!-- The thing with the @ symbol and the dot com at the end. -->
- <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'email-hint')}" />
- <c:if test="${not empty hint}">
- <span class="hint">
+ <div class="col-lg-10">
+ <input name="email" id="email" type="text" />
+ <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'email-hint')}" />
+ <c:if test="${not empty hint}">
+ <span class="hint">
<![CDATA[${hint}<span class="hint-pointer"> </span>]]>
- </span>
- </c:if>
- </dd>
- <!-- BIRTH YEAR -->
- <dt>
- <label for="year">
+ </span>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-2 control-label" for="year">
<contextmenu:element name="year" menu="samples-form-label">Birth Year:</contextmenu:element>
</label>
- </dt>
- <dd>
- <select id="year" name="year">
- <option value="">YYYY</option>
- <option value="1066">1066</option>
- <option value="1492">1492</option>
- <option value="1776">1776</option>
- <option value="1812">1812</option>
- <option value="1917">1917</option>
- <option value="1942">1942</option>
- <option value="1999">1999</option>
- </select>
- <!-- Pick a famous year to be born in. -->
- <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'year-hint')}" />
- <c:if test="${not empty hint}">
- <span class="hint">
+ <div class="col-lg-10">
+ <select id="year" name="year">
+ <option value="">YYYY</option>
+ <option value="1066">1066</option>
+ <option value="1492">1492</option>
+ <option value="1776">1776</option>
+ <option value="1812">1812</option>
+ <option value="1917">1917</option>
+ <option value="1942">1942</option>
+ <option value="1999">1999</option>
+ </select>
+ <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'year-hint')}" />
+ <c:if test="${not empty hint}">
+ <span class="hint">
<![CDATA[${hint}<span class="hint-pointer"> </span>]]>
- </span>
- </c:if>
- </dd>
- <!-- USERNAME -->
- <dt>
- <label for="username">
+ </span>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-2 control-label" for="username">
<contextmenu:element name="username" menu="samples-form-label">Username:</contextmenu:element>
</label>
- </dt>
- <dd>
- <input name="username" id="username" type="text" />
- <!-- Between 4-12 characters. -->
- <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'username-hint')}" />
- <c:if test="${not empty hint}">
- <span class="hint">
+ <div class="col-lg-10">
+ <input name="username" id="username" type="text" />
+ <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'username-hint')}" />
+ <c:if test="${not empty hint}">
+ <span class="hint">
<![CDATA[${hint}<span class="hint-pointer"> </span>]]>
- </span>
- </c:if>
- </dd>
- <!-- PASSWORD -->
- <dt>
- <label for="password">
+ </span>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-2 control-label" for="password">
<contextmenu:element name="password" menu="samples-form-label">Password:</contextmenu:element>
</label>
- </dt>
- <dd>
- <input name="password" id="password" type="password" />
- <!-- Between 5-13 characters, but not 7. Never 7. -->
- <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'password-hint')}" />
- <c:if test="${not empty hint}">
- <span class="hint">
+ <div class="col-lg-10">
+ <input name="password" id="password" type="password" />
+ <c:set var="hint" value="${contextmenu:entryValue(content.JCRNode, 'password-hint')}" />
+ <c:if test="${not empty hint}">
+ <span class="hint">
<![CDATA[${hint}<span class="hint-pointer"> </span>]]>
- </span>
- </c:if>
- </dd>
- <dt class="button">&nbsp;</dt>
- <dd class="button">
- <input type="submit" class="button" value="Submit" />
- </dd>
- </dl>
+ </span>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-2 col-lg-10">
+ <button type="submit" class="btn btn-default">Submit</button>
+ </div>
+ </div>
+ </form>
</div>
</section>
</jsp:root>
\ 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-09-15 19:17:55
|
Revision: 4312
http://openutils.svn.sourceforge.net/openutils/?rev=4312&view=rev
Author: fgiust
Date: 2013-09-15 19:17:52 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 19:17:52 UTC (rev 4312)
@@ -5,32 +5,9 @@
<display-name>Magnolia context menu Tags and EL functions</display-name>
<tlib-version>1.0</tlib-version>
<short-name>mcmenu</short-name>
- <uri>mgnlcontextmenu</uri>
+ <uri>http://openutils/mgnlcontextmenu</uri>
<tag>
<description>
- <![CDATA[Imports js and css resources for the editing of contents via context menu. Should be used in the head
- section of the page.]]>
- </description>
- <display-name>links</display-name>
- <name>links</name>
- <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.LinksTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <description>The JavaScript framework to use: can be jquery or mootools.</description>
- <name>jsFramework</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <description>Should be set to true if the JavaScript framework is already included in the page.</description>
- <name>skipJsFramework</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <type>boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
<![CDATA[Wraps an HTML snippet and possibly replaces it with content set by the editor user.<br />
Editor users have access to a context menu which opens on mouse right click.]]>
</description>
@@ -87,16 +64,6 @@
<type>boolean</type>
</attribute>
</tag>
- <tag>
- <description>
- <![CDATA[Collects all informations about context menu definitions and use, and exposes them as JavaScript
- variables.]]>
- </description>
- <display-name>script</display-name>
- <name>script</name>
- <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.ScriptTag</tag-class>
- <body-content>empty</body-content>
- </tag>
<function>
<description>
<![CDATA[Gets the entry value for the specified key, searching for it in the local and global contents
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -25,7 +25,7 @@
<sv:value>/templates/samples-contextmenu/paragraph-form.jsp</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
- <sv:value>Form sample for module contextmenu</sv:value>
+ <sv:value>Form sample (jsp)</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -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-09-13T19:26:18.358+02:00</sv:value>
+ <sv:value>2013-09-15T20:31:48.082+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-contextmenu-message-freemarker" 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>5eb0498e-da6d-4465-b076-84c5354503a4</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph showing a message which can be edited via context menu.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>contextmenu:samples-contextmenu-message</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-contextmenu/paragraph-message.ftl</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Message sample (freemarker)</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T20:31:38.258+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.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
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -25,7 +25,7 @@
<sv:value>/templates/samples-contextmenu/paragraph-message.jsp</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
- <sv:value>Message sample for module contextmenu</sv:value>
+ <sv:value>Message sample (jsp)</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -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-09-13T19:25:35.319+02:00</sv:value>
+ <sv:value>2013-09-15T20:31:53.389+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -25,7 +25,7 @@
<sv:value>/templates/samples-contextmenu/paragraph-textmedia.jsp</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
- <sv:value>Text-media sample for module contextmenu</sv:value>
+ <sv:value>Text-media sample (jsp)</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -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-09-13T19:26:31.070+02:00</sv:value>
+ <sv:value>2013-09-15T20:32:01.621+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -16,7 +16,7 @@
<sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/samples-contextmenu/contextmenu-template.ftl</sv:value>
+ <sv:value>/samples-contextmenu/template-contextmenu.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Contextmenu sample (freemarker)</sv:value>
@@ -257,6 +257,43 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="samples-contextmenu-message-freemarker">
+ <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>becb783b-3a0e-4893-9b98-9c52951707c2</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-message-freemarker</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T20:32:43.126+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -16,7 +16,7 @@
<sv:value>jsp</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-contextmenu/template.jsp</sv:value>
+ <sv:value>/templates/samples-contextmenu/template-contextmenu.jsp</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Contextmenu sample (jsp)</sv:value>
@@ -257,6 +257,43 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="samples-contextmenu-message-freemarker">
+ <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>0827dab8-2621-44cc-801c-55bda8ce1d65</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-message-freemarker</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T20:32:51.882+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-15 19:17:52 UTC (rev 4312)
@@ -29,7 +29,7 @@
<sv:value>2010-05-18T14:33:10.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-15T17:38:45.728+02:00</sv:value>
+ <sv:value>2013-09-15T20:41:36.141+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:pages/contextmenu-template-jsp</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2010-05-18T16:43:29.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T19:28:07.245+02:00</sv:value>
+ <sv:value>2013-09-15T20:41:06.907+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -219,7 +219,7 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="04">
+ <sv:node sv:name="03">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:component</sv:value>
</sv:property>
@@ -227,13 +227,13 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>291f2c89-13b7-4876-8bed-fb6869fc1ccc</sv:value>
+ <sv:value>3c8d6a5f-1b83-4959-ace5-cc3ec53236f2</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>I'm a text</p></sv:value>
+ <sv:property sv:name="message" sv:type="String">
+ <sv:value>Right click here to edit</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -246,42 +246,54 @@
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2013-09-13T19:18:16.577+02:00</sv:value>
+ <sv:value>2013-09-13T19:17:58.919+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T19:27:55.818+02:00</sv:value>
+ <sv:value>2013-09-13T19:28:07.245+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>contextmenu:components/samples-contextmenu-textmedia</sv:value>
+ <sv:value>contextmenu:components/samples-contextmenu-message</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
+ </sv:node>
+ <sv:node sv:name="05">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:component</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>6c35ebd5-e5e2-4bdf-a4e7-c2fca72bf604</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="message" sv:type="String">
+ <sv:value>Right click here to edit</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:metaData</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:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
</sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>c0849975-45ec-49ec-8b03-3c9efaae4bfd</sv:value>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
</sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-09-15T20:41:06.907+02:00</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>2013-09-13T19:27:55.815+02:00</sv:value>
- </sv:property>
- </sv:node>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T20:41:06.907+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-message-freemarker</sv:value>
+ </sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="03">
+ <sv:node sv:name="04">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:component</sv:value>
</sv:property>
@@ -289,13 +301,13 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>3c8d6a5f-1b83-4959-ace5-cc3ec53236f2</sv:value>
+ <sv:value>291f2c89-13b7-4876-8bed-fb6869fc1ccc</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="message" sv:type="String">
- <sv:value>Right click here to edit</sv:value>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value><p>I'm a text</p></sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -308,15 +320,40 @@
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2013-09-13T19:17:58.919+02:00</sv:value>
+ <sv:value>2013-09-13T19:18:16.577+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T19:28:07.245+02:00</sv:value>
+ <sv:value>2013-09-13T19:27:55.818+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>contextmenu:components/samples-contextmenu-message</sv:value>
+ <sv:value>contextmenu:components/samples-contextmenu-textmedia</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>c0849975-45ec-49ec-8b03-3c9efaae4bfd</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>2013-09-13T19:27:55.815+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
<sv:node sv:name="02">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-15 19:17:52 UTC (rev 4312)
@@ -1,7 +1,7 @@
<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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:contextmenu="mgnlcontextmenu">
+ xmlns:contextmenu="http://openutils/mgnlcontextmenu">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<section>
<h3>Form sample (jsp)</h3>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp 2013-09-15 19:17:52 UTC (rev 4312)
@@ -1,7 +1,7 @@
<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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:contextmenu="mgnlcontextmenu">
+ xmlns:contextmenu="http://openutils/mgnlcontextmenu">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<section>
<h3>Message sample (jsp)</h3>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-15 19:17:52 UTC (rev 4312)
@@ -1,7 +1,7 @@
<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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:contextmenu="mgnlcontextmenu">
+ xmlns:contextmenu="http://openutils/mgnlcontextmenu">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<section>
<h3>Text/media sample (jsp)</h3>
Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp (from rev 4311, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-15 19:17:52 UTC (rev 4312)
@@ -0,0 +1,46 @@
+<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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+ xmlns:contextmenu="http://openutils/mgnlcontextmenu">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <jsp:text>
+ <![CDATA[<!DOCTYPE html> ]]>
+ </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>
+
+ <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script>
+
+ ${contextmenu:links()}
+
+ <cms:init />
+
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" />
+
+ <!-- samples css/js -->
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />
+ <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/contextmenu-samples.js">/**/</script>
+ <!-- end samples css/js -->
+ </head>
+ <body>
+ <div class="container">
+ <h1>${content.title}</h1>
+ <section>
+ <h2>JSP sample</h2>
+ <p>
+ <span>Add the following to your template in order to initialize the contextmenu module:</span>
+ <ul>
+ <li>add <code>${'$'}{contextmenu:links()}</code> (just before <code>&lt;/head&gt;</code>)</li>
+ <li>add <code>${'$'}{contextmenu:scripts()}</code> (just before <code>&lt;/body&gt;</code>)</li>
+ <li>add the jquery library</li>
+ </ul>
+ </p>
+ </section>
+ <cms:area name="main" />
+ </div>
+ ${contextmenu:scripts()}
+ </body>
+ </html>
+</jsp:root>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp 2013-09-15 19:17:52 UTC (rev 4312)
@@ -1,45 +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:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:contextmenu="mgnlcontextmenu">
- <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>
-
- <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script>
-
- ${contextmenu:links()}
-
- <cms:init />
-
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" />
-
- <!-- samples css/js -->
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />
- <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/contextmenu-samples.js">/**/</script>
- <!-- end samples css/js -->
- </head>
- <body>
- <div class="container">
- <h1>${content.title}</h1>
- <section>
- <p>
- <span>Add the following to your template in order to initialize the contextmenu module:</span>
- <ul>
- <li>add <code>${'$'}{contextmenu:links()}</code> (just before <code>&lt;/head&gt;</code>)</li>
- <li>add <code>${'$'}{contextmenu:scripts()}</code> (just before <code>&lt;/body&gt;</code>)</li>
- <li>add the jquery library</li>
- </ul>
- </p>
- </section>
- <cms:area name="main" />
- </div>
- ${contextmenu:scripts()}
- </body>
- </html>
-</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl 2013-09-15 19:17:52 UTC (rev 4312)
@@ -0,0 +1,10 @@
+[#assign contextmenu=JspTaglibs["http://openutils/mgnlcontextmenu"]]
+<section>
+ <h3>Message sample (freemarker)</h3>
+ <p>Right click to edit the message below</p>
+ <pre>${'[#assign contextmenu=JspTaglibs["http://openutils/mgnlcontextmenu"]]'}
+${'[@contextmenu.element name="message"]'}${'$'}{content.message}${'[/@contextmenu.element]'}</pre>
+ <div class="testcontent">
+ [@contextmenu.element name="message"]${content.message!}[/@contextmenu.element]
+ </div>
+</section>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.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-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-09-15 18:26:35 UTC (rev 4311)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-09-15 19:17:52 UTC (rev 4312)
@@ -3,17 +3,36 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${content.title!}</title>
+
+ <script src="${contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script>
+
+ ${contextmenu.links()}
+
[@cms.init /]
+
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/bootstrap.min.css" />
+
+ <!-- samples css/js -->
<link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />
+ <script src="${contextPath}/.resources/contextmenu/js/contextmenu-samples.js">/**/</script>
+ <!-- end samples css/js -->
</head>
<body>
<div class="container">
- <header>
- <h1>${content.title!}</h1>
- </header>
- <div> [@cms.area name="main" /]
- </div>
+ <h1>${content.title!}</h1>
+ <section>
+ <h2>Freemarker sample</h2>
+ <p>
+ <span>Add the following to your template in order to initialize the contextmenu module:</span>
+ <ul>
+ <li>add <code>${'$'}{contextmenu.links()}</code> (just before <code></head></code>)</li>
+ <li>add <code>${'$'}{contextmenu.scripts()}</code> (just before <code></body></code>)</li>
+ <li>add the jquery library</li>
+ </ul>
+ </p>
+ </section>
+ [@cms.area name="main" /]
</div>
+ ${contextmenu.scripts()}
</body>
</html>
\ 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-09-15 18:26:40
|
Revision: 4311
http://openutils.svn.sourceforge.net/openutils/?rev=4311&view=rev
Author: fgiust
Date: 2013-09-15 18:26:35 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/contextmenu-samples.css
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-hint.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-label.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-media.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-text.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/pointer.gif
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-samples.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/docroot/
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-mootools.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/mootools-1.2.4-core-yc.js
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-09-15 14:52:07 UTC (rev 4310)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-15 18:26:35 UTC (rev 4311)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
+import info.magnolia.cms.security.Permission;
+import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
@@ -27,6 +29,7 @@
import net.sourceforge.openutils.mgnlcontextmenu.configuration.PersistenceStrategy;
import net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule;
+import net.sourceforge.openutils.mgnlcontextmenu.tags.MenuScripts;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,8 +58,35 @@
ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
// LB crazy command! mgnl argsss
- Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
+ Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
return strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null;
}
+ public static String scripts()
+ {
+ return MenuScripts.write();
+ }
+
+ public static String links()
+ {
+ String ctx = MgnlContext.getContextPath();
+ boolean canEdit = NodeUtil.isGranted(
+ MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ Permission.SET);
+
+ StringBuilder out = new StringBuilder();
+
+ if (canEdit)
+ {
+ out.append("<!-- start contextmenu:links -->\n");
+ out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+ + ctx
+ + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
+ out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n");
+ out.append("<!-- end contextmenu:links -->\n");
+ }
+
+ return out.toString();
+ }
+
}
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2013-09-15 14:52:07 UTC (rev 4310)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2013-09-15 18:26:35 UTC (rev 4311)
@@ -1,131 +0,0 @@
-/**
- *
- * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.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.mgnlcontextmenu.tags;
-
-import info.magnolia.cms.security.Permission;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.util.NodeUtil;
-
-import java.io.IOException;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class LinksTag extends TagSupport
-{
-
- private String jsFramework;
-
- private boolean skipJsFramework;
-
- /**
- * Sets the jsFramework.
- * @param jsFramework the jsFramework to set
- */
- public void setJsFramework(String jsFramework)
- {
- this.jsFramework = jsFramework;
- }
-
- /**
- * Sets the skipJsFramework.
- * @param skipJsFramework the skipJsFramework to set
- */
- public void setSkipJsFramework(boolean skipJsFramework)
- {
- this.skipJsFramework = skipJsFramework;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int doStartTag() throws JspException
- {
- String ctx = MgnlContext.getContextPath();
- boolean canEdit = canEdit();
- JspWriter out = pageContext.getOut();
- try
- {
- if (canEdit)
- {
- out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\""
- + ctx
- + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />");
- out.print("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>");
- }
- if ("jquery".equalsIgnoreCase(jsFramework))
- {
- if (!skipJsFramework)
- {
- out.print("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery-1.4.2.min.js\"></script>");
- }
- if (canEdit)
- {
- out.print("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>");
- }
- }
- else if ("mootools".equalsIgnoreCase(jsFramework))
- {
- if (!skipJsFramework)
- {
- out.print("<script src=\""
- + ctx
- + "/.resources/contextmenu/js/mootools-1.2.4-core-yc.js\"></script>");
- }
- if (canEdit)
- {
- out
- .print("<script src=\""
- + ctx
- + "/.resources/contextmenu/js/contextmenu-mootools.js\"></script>");
- }
- }
- }
- catch (IOException e)
- {
- throw new JspException(e);
- }
- return EVAL_PAGE;
- }
-
- @SuppressWarnings("deprecation")
- private boolean canEdit()
- {
- return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void release()
- {
- jsFramework = null;
- skipJsFramework = false;
- super.release();
- }
-}
Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java (from rev 4310, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-15 18:26:35 UTC (rev 4311)
@@ -0,0 +1,150 @@
+/**
+ *
+ * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.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.mgnlcontextmenu.tags;
+
+import info.magnolia.cms.security.Permission;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenu;
+import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuItem;
+import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class MenuScripts
+{
+
+ public static String write()
+ {
+ if (canEdit())
+ {
+ StringBuilder out = new StringBuilder();
+
+ out.append("<!-- start contextmenu:scripts -->\n");
+ out.append("<script type=\"text/javascript\">\n");
+ out.append("var mgnlContextMenuInfo = {\n");
+ out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n");
+ out.append(" menus: " + menusJs() + ",\n");
+ out.append(" elements: " + elementsJs() + "\n");
+ out.append("};\n");
+ out.append("</script>\n");
+ out.append("<!-- end contextmenu:scripts -->\n");
+ return out.toString();
+ }
+ return StringUtils.EMPTY;
+ }
+
+ private static String menusJs()
+ {
+ StringBuilder sb = new StringBuilder();
+ int i = 0;
+ for (ContextMenu menu : ContextMenuManager.getInstance().getMenus())
+ {
+ if (i > 0)
+ {
+ sb.append(',');
+ }
+ sb.append("{");
+ sb.append("'name':'").append(menu.getName()).append("',");
+ sb.append("'items':[");
+ int j = 0;
+ for (ContextMenuItem item : menu.getItems())
+ {
+ if (j > 0)
+ {
+ sb.append(',');
+ }
+ sb.append("{");
+ sb.append("'name':'").append(item.getName()).append("'");
+ sb.append(",'controlType':'").append(item.getControlType()).append("'");
+ sb.append(",'icon':'").append(item.getIcon()).append("'");
+ sb.append(",'text':'").append(item.getText()).append("'");
+ sb.append(",'globalEnabled':").append(item.isGlobalEnabled());
+ sb.append("}");
+ j++;
+ }
+ sb.append("],");
+ sb.append("'mouseoverClass':'").append(StringUtils.defaultString(menu.getMouseoverClass())).append("',");
+ sb.append("'mouseoverIcon':'").append(StringUtils.defaultString(menu.getMouseoverIcon())).append("'");
+ sb.append("}");
+ i++;
+ }
+ return "[" + sb + "]";
+ }
+
+ @SuppressWarnings("unchecked")
+ private static String elementsJs()
+ {
+ StringBuilder sb = new StringBuilder();
+ List infos = (List) MgnlContext.getWebContext().getRequest().getAttribute(ElementTag.ELEMENT_INFOS_KEY);
+ if (infos != null)
+ {
+ for (Object item : infos)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(',');
+ }
+ ElementInfo info = (ElementInfo) item;
+ sb.append("'").append(info.getElementId()).append("'");
+ sb.append(":{");
+ if (!StringUtils.isEmpty(info.getEntryName()))
+ {
+ sb.append("'entryName':'").append(info.getEntryName()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getContextMenu()))
+ {
+ sb.append("'contextMenu':'").append(info.getContextMenu()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getParentTrigger()))
+ {
+ sb.append("'parentTrigger':'").append(info.getParentTrigger()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getEnterMode()))
+ {
+ sb.append("'enterMode':'").append(info.getEnterMode()).append("',");
+ }
+ sb.append("'path':'").append(info.getPath()).append("'");
+ sb.append('}');
+ }
+ }
+ return "{" + sb + "}";
+ }
+
+ @SuppressWarnings("deprecation")
+ private static boolean canEdit()
+ {
+ return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+ }
+
+}
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2013-09-15 14:52:07 UTC (rev 4310)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2013-09-15 18:26:35 UTC (rev 4311)
@@ -1,157 +0,0 @@
-/**
- *
- * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.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.mgnlcontextmenu.tags;
-
-import info.magnolia.cms.security.Permission;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.util.NodeUtil;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenu;
-import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuItem;
-import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class ScriptTag extends TagSupport
-{
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int doStartTag() throws JspException
- {
- if (canEdit())
- {
- JspWriter out = pageContext.getOut();
- try
- {
- out.println("<script type=\"text/javascript\">");
- out.println("var mgnlContextMenuInfo = {");
- out.println(" contextPath: '" + MgnlContext.getContextPath() + "',");
- out.println(" menus: " + menusJs() + ",");
- out.println(" elements: " + elementsJs());
- out.println("};");
- out.println("</script>");
- }
- catch (IOException e)
- {
- throw new JspException(e);
- }
- }
- return EVAL_PAGE;
- }
-
- protected String menusJs()
- {
- StringBuilder sb = new StringBuilder();
- int i = 0;
- for (ContextMenu menu : ContextMenuManager.getInstance().getMenus())
- {
- if (i > 0)
- {
- sb.append(',');
- }
- sb.append("{");
- sb.append("'name':'").append(menu.getName()).append("',");
- sb.append("'items':[");
- int j = 0;
- for (ContextMenuItem item : menu.getItems())
- {
- if (j > 0)
- {
- sb.append(',');
- }
- sb.append("{");
- sb.append("'name':'").append(item.getName()).append("'");
- sb.append(",'controlType':'").append(item.getControlType()).append("'");
- sb.append(",'icon':'").append(item.getIcon()).append("'");
- sb.append(",'text':'").append(item.getText()).append("'");
- sb.append(",'globalEnabled':").append(item.isGlobalEnabled());
- sb.append("}");
- j++;
- }
- sb.append("],");
- sb.append("'mouseoverClass':'").append(StringUtils.defaultString(menu.getMouseoverClass())).append("',");
- sb.append("'mouseoverIcon':'").append(StringUtils.defaultString(menu.getMouseoverIcon())).append("'");
- sb.append("}");
- i++;
- }
- return "[" + sb + "]";
- }
-
- @SuppressWarnings("unchecked")
- protected String elementsJs()
- {
- StringBuilder sb = new StringBuilder();
- List infos = (List) MgnlContext.getWebContext().getRequest().getAttribute(ElementTag.ELEMENT_INFOS_KEY);
- if (infos != null)
- {
- for (Object item : infos)
- {
- if (sb.length() > 0)
- {
- sb.append(',');
- }
- ElementInfo info = (ElementInfo) item;
- sb.append("'").append(info.getElementId()).append("'");
- sb.append(":{");
- if (!StringUtils.isEmpty(info.getEntryName()))
- {
- sb.append("'entryName':'").append(info.getEntryName()).append("',");
- }
- if (!StringUtils.isEmpty(info.getContextMenu()))
- {
- sb.append("'contextMenu':'").append(info.getContextMenu()).append("',");
- }
- if (!StringUtils.isEmpty(info.getParentTrigger()))
- {
- sb.append("'parentTrigger':'").append(info.getParentTrigger()).append("',");
- }
- if (!StringUtils.isEmpty(info.getEnterMode()))
- {
- sb.append("'enterMode':'").append(info.getEnterMode()).append("',");
- }
- sb.append("'path':'").append(info.getPath()).append("'");
- sb.append('}');
- }
- }
- return "{" + sb + "}";
- }
-
- @SuppressWarnings("deprecation")
- private boolean canEdit()
- {
- return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
- }
-
-}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 14:52:07 UTC (rev 4310)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 18:26:35 UTC (rev 4311)
@@ -106,4 +106,20 @@
<function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
<function-signature>java.lang.String entryValue(javax.jcr.Node, java.lang.String)</function-signature>
</function>
+ <function>
+ <description>
+ Adds the contextmenu scripts/css
+ </description>
+ <name>links</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>java.lang.String links()</function-signature>
+ </function>
+ <function>
+ <description>
+ Initializes the contextmenu scripts
+ </description>
+ <name>scripts</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>java.lang.String scripts()</function-signature>
+ </function>
</taglib>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml 2013-09-15 18:26:35 UTC (rev 4311)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu" 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>735a8570-4e91-433c-87c2-0a6e8ff219b5</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:41:15.936+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.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-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-15 18:26:35 UTC (rev 4311)
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-template-freemarker" 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>f1afbb56-2918-4d2c-ac4f-0e206207cc1e</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-contextmenu/contextmenu-template.ftl</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Contextmenu sample (freemarker)</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-09-15T17:38:27.160+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="areas">
+ <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>ffdb82d7-78da-4fac-851c-94cbda5d0444</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>2012-03-21T07:30:29.457+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:17.378+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="main">
+ <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>70c7a216-e06c-4844-b06e-e6e5d3e0bce1</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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>
+ </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>2012-03-21T07:30:36.643+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:17.378+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="availableComponents">
+ <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>bbeee7bb-a843-4c16-9e7c-aa6633acd12d</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>2012-03-21T07:32:04.848+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:17.378+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-form">
+ <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>be896f41-a62f-4174-95bd-c76effd639d9</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-form</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:17.379+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-message">
+ <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>31119471-71f1-454c-a06e-7f5c530d4b4b</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-message</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:17.379+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-textmedia">
+ <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>cc0984d8-2144-40f3-84f0-3dab7afa0202</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-textmedia</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:17.379+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.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-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-15 18:26:35 UTC (rev 4311)
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="contextmenu-template-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>b6628cbe-83ba-4175-aeb6-66074c79aa70</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-contextmenu/template.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Contextmenu sample (jsp)</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-09-15T17:38:00.886+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="areas">
+ <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>af60d4a8-3fd3-483f-9722-b0c0b8731b17</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>2012-03-21T07:30:29.457+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:08.411+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="main">
+ <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>c149e129-d0b0-444c-9921-66bf38daf9a8</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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>
+ </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>2012-03-21T07:30:36.643+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:08.411+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="availableComponents">
+ <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>cf2a6d5c-703b-481c-afe7-377e82fc22f4</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>2012-03-21T07:32:04.848+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:08.411+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-form">
+ <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>2210fc23-d9cc-416e-8a84-d94e7064adc4</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-form</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:08.412+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-message">
+ <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>17f2736a-ba93-4dcc-8e86-2f8aec9f61a6</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-message</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:08.412+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-textmedia">
+ <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>b816a1a0-cdaf-4aba-ae4e-111ef99de914</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-textmedia</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T17:37:08.412+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-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
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml 2013-09-15 14:52:07 UTC (rev 4310)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml 2013-09-15 18:26:35 UTC (rev 4311)
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="sampleContextMenu" 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>0581824a-e17f-47ea-9035-3dcc8df430ce</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-contextmenu/template.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Context menu sample template</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-09-13T13:05:57.000+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="areas">
- <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>4abf9065-e505-4dad-aa38-4ba4cd20fc6c</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>2012-03-21T07:30:29.457+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T13:06:07.585+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="main">
- <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>f2422716-9c0f-4ae2-af0c-e5aad9d76915</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</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>
- </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>2012-03-21T07:30:36.643+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T13:06:07.586+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="availableComponents">
- <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>84b27713-7935-40d7-8f7a-7cc00bca8306</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>
- ...
[truncated message content] |
|
From: <fg...@us...> - 2013-09-15 14:52:11
|
Revision: 4310
http://openutils.svn.sourceforge.net/openutils/?rev=4310&view=rev
Author: fgiust
Date: 2013-09-15 14:52:07 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -41,6 +41,7 @@
* @author dschivo
*/
@Singleton
+@SuppressWarnings("deprecation")
public class ContextMenuManager extends ObservedManager
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -19,8 +19,6 @@
package net.sourceforge.openutils.mgnlcontextmenu.dialog;
-import info.magnolia.cms.util.RequestFormUtil;
-import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
import javax.jcr.Node;
@@ -42,7 +40,7 @@
public static String getValue(HttpServletRequest request, Node node, String scope)
{
- String name = new RequestFormUtil(request).getParameter("entryName");
+ String name = request.getParameter("entryName");
String value = null;
if (name != null)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -31,6 +31,7 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class EditDialogControl extends DialogEdit
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -41,6 +41,7 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class EntrySaveHandler implements FieldSaveHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -31,6 +31,7 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class FckEditDialogControl extends FckEditorDialog
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -32,6 +32,7 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class MediaDialogControl extends DialogSelectMedia
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -19,9 +19,10 @@
package net.sourceforge.openutils.mgnlcontextmenu.setup;
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -49,7 +50,7 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.bootstrap.samples"))
{
tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -38,6 +38,7 @@
* @author fgiust
* @author dschivo
*/
+@SuppressWarnings("deprecation")
public class FilesExtractionTask extends AbstractTask
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -45,6 +45,7 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class ElementTag extends BodyTagSupport
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -112,6 +112,7 @@
return EVAL_PAGE;
}
+ @SuppressWarnings("deprecation")
private boolean canEdit()
{
return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2013-09-15 14:52:07 UTC (rev 4310)
@@ -148,6 +148,7 @@
return "{" + sb + "}";
}
+ @SuppressWarnings("deprecation")
private boolean canEdit()
{
return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 14:47:09
|
Revision: 4309
http://openutils.svn.sourceforge.net/openutils/?rev=4309&view=rev
Author: fgiust
Date: 2013-09-15 14:47:08 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
mgnlutils stable version
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-15 14:45:32 UTC (rev 4308)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-15 14:47:08 UTC (rev 4309)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.2-SNAPSHOT</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 14:45:35
|
Revision: 4308
http://openutils.svn.sourceforge.net/openutils/?rev=4308&view=rev
Author: fgiust
Date: 2013-09-15 14:45:32 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-15 14:45:32 UTC (rev 4308)
@@ -19,12 +19,13 @@
package it.openutils.mgnltasks;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Delta;
import info.magnolia.module.delta.DeltaBuilder;
import info.magnolia.module.model.Version;
-import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
+import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.HashSet;
@@ -99,12 +100,14 @@
.add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
// only for development, add the (module)-dev bootstrap directory
- if (MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop"))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop"))
{
- if (StringUtils.isEmpty(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"))
- || StringUtils.contains(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"), ctx
- .getCurrentModuleDefinition()
- .getName()))
+ if (StringUtils.isEmpty(Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+ "magnolia.bootstrapdev"))
+ || StringUtils.contains(
+ Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+ "magnolia.bootstrapdev"),
+ ctx.getCurrentModuleDefinition().getName()))
{
deltas
.get(0)
@@ -122,7 +125,8 @@
List<Delta> deltas = new ArrayList<Delta>();
- if (MgnlUtilsDeprecatedAdapters.getBooleanProperty(modulename + ".update.disabled"))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ modulename + ".update.disabled"))
{
return deltas;
}
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-09-15 14:45:32 UTC (rev 4308)
@@ -104,16 +104,6 @@
return null;
}
- public static String getProperty(String name)
- {
- return SystemProperty.getProperty(name);
- }
-
- public static boolean getBooleanProperty(String name)
- {
- return SystemProperty.getBooleanProperty(name);
- }
-
public static Properties systemProperties()
{
return SystemProperty.getProperties();
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-09-15 14:45:32 UTC (rev 4308)
@@ -32,6 +32,7 @@
import info.magnolia.cms.security.auth.Entity;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.jaas.principal.EntityImpl;
import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
@@ -217,7 +218,7 @@
*/
public static boolean develop()
{
- return MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop");
+ return Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop");
}
/**
@@ -1249,7 +1250,7 @@
*/
public static String systemProperty(String key)
{
- return MgnlUtilsDeprecatedAdapters.getProperty(key);
+ return Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(key);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 14:41:54
|
Revision: 4307
http://openutils.svn.sourceforge.net/openutils/?rev=4307&view=rev
Author: fgiust
Date: 2013-09-15 14:41:50 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java 2013-09-15 14:29:16 UTC (rev 4306)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java 2013-09-15 14:41:50 UTC (rev 4307)
@@ -43,6 +43,7 @@
* @author dschivo
*/
@Singleton
+@SuppressWarnings("deprecation")
public class ExpressionFunctionManager extends ObservedManager
{
@@ -98,7 +99,8 @@
if (functionNode.hasContent("parameterTypes"))
{
Content parameterTypesNode = functionNode.getContent("parameterTypes");
- for (Iterator iter2 = ContentUtil.getAllChildren(parameterTypesNode).iterator(); iter2.hasNext();)
+ for (Iterator iter2 = ContentUtil.getAllChildren(parameterTypesNode).iterator(); iter2
+ .hasNext();)
{
Content n = (Content) iter2.next();
String value = NodeDataUtil.getString(n, "value");
@@ -121,8 +123,9 @@
try
{
- functions.put("rules:" + functionName, methodClass.getMethod(methodName, parameterTypes
- .toArray(new Class[0])));
+ functions.put(
+ "rules:" + functionName,
+ methodClass.getMethod(methodName, parameterTypes.toArray(new Class[0])));
}
catch (SecurityException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java 2013-09-15 14:29:16 UTC (rev 4306)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java 2013-09-15 14:41:50 UTC (rev 4307)
@@ -30,6 +30,7 @@
import java.util.List;
import javax.inject.Singleton;
+import javax.jcr.Node;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -41,6 +42,7 @@
* @version $Id$
*/
@Singleton
+@SuppressWarnings("deprecation")
public class ExpressionLibraryManager extends ObservedManager
{
@@ -78,9 +80,8 @@
try
{
Class providerClass = Class.forName(providerClassName);
- ExpressionLibrary library = (ExpressionLibrary) providerClass
- .getConstructor(Content.class)
- .newInstance(providerNode);
+ ExpressionLibrary library = (ExpressionLibrary) providerClass.getConstructor(Node.class).newInstance(
+ providerNode.getJCRNode());
if (library.isVisible())
{
libraries.add(library);
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java 2013-09-15 14:29:16 UTC (rev 4306)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java 2013-09-15 14:41:50 UTC (rev 4307)
@@ -19,14 +19,13 @@
package net.sourceforge.openutils.mgnlrules.configuration;
-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 java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -44,24 +43,25 @@
protected final boolean visible;
- public RepositoryExpressionLibrary(Content configNode)
+ public RepositoryExpressionLibrary(Node configNode)
{
- name = configNode.getName();
- label = NodeDataUtil.getString(configNode, "label");
- visible = NodeDataUtil.getBoolean(configNode, "visible", true);
+ name = NodeUtil.getName(configNode);
+ label = PropertyUtil.getString(configNode, "label");
+ visible = PropertyUtil.getBoolean(configNode, "visible", true);
expressions = new ArrayList<Expression>();
try
{
- if (configNode.hasContent("expressions"))
+ if (configNode.hasNode("expressions"))
{
- Content expressionsNode = configNode.getContent("expressions");
- Iterator it = ContentUtil.getAllChildren(expressionsNode).iterator();
- while (it.hasNext())
+ Node expressionsNode = configNode.getNode("expressions");
+
+ Iterable<Node> nodes = NodeUtil.getNodes(expressionsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node node : nodes)
{
- Content n = (Content) it.next();
- String label = NodeDataUtil.getString(n, "label");
- String value = NodeDataUtil.getString(n, "value");
+ String label = PropertyUtil.getString(node, "label");
+ String value = PropertyUtil.getString(node, "value");
expressions.add(new Expression(label, value));
}
}
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java 2013-09-15 14:29:16 UTC (rev 4306)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java 2013-09-15 14:41:50 UTC (rev 4307)
@@ -38,6 +38,7 @@
* @author fgiust
* @author dschivo
*/
+@SuppressWarnings("deprecation")
public class FilesExtractionTask extends AbstractTask
{
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2013-09-15 14:29:16 UTC (rev 4306)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2013-09-15 14:41:50 UTC (rev 4307)
@@ -19,9 +19,10 @@
package net.sourceforge.openutils.mgnlrules.setup;
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
import java.util.ArrayList;
@@ -58,7 +59,8 @@
}
});
- if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.bootstrap.samples"))
{
tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 14:29:21
|
Revision: 4306
http://openutils.svn.sourceforge.net/openutils/?rev=4306&view=rev
Author: fgiust
Date: 2013-09-15 14:29:16 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/paragraph-evaluate.ftl
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional-freemarker.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/rules-samples.css
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/paragraph-conditional.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-conditional.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-evaluate.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-grid.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-if-then-else.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/expressions/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java 2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java 2013-09-15 14:29:16 UTC (rev 4306)
@@ -121,7 +121,7 @@
try
{
- functions.put("mexpr:" + functionName, methodClass.getMethod(methodName, parameterTypes
+ functions.put("rules:" + functionName, methodClass.getMethod(methodName, parameterTypes
.toArray(new Class[0])));
}
catch (SecurityException e)
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java 2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java 2013-09-15 14:29:16 UTC (rev 4306)
@@ -44,19 +44,10 @@
public class ExpressionsElFunctions
{
- /**
- *
- */
public static final String EXPRESSION_KEY = ExpressionsElFunctions.class.getName() + ".expression";
- /**
- *
- */
- public static final String EVALUATE_JSP = "/WEB-INF/jsps/expressions/evaluate.jsp";
+ public static final String EVALUATE_JSP = "/WEB-INF/jsps/rules/evaluate.jsp";
- /**
- * Logger.
- */
private static Logger log = LoggerFactory.getLogger(ExpressionsElFunctions.class);
/**
@@ -69,6 +60,8 @@
*/
public static Object evaluate(String expression, PageContext pageContext) throws JspException
{
+ WebContext wc = MgnlContext.getWebContext("Expressions can only be evaluated with a WebContext");
+
Evaluator evaluator = (Evaluator) ExpressionEvaluatorManager
.getEvaluatorByName(ExpressionEvaluatorManager.EVALUATOR_CLASS);
return evaluator.evaluate(
@@ -78,7 +71,7 @@
null,
pageContext,
ExpressionFunctionManager.getInstance().getFunctions(),
- "mexpr");
+ "rules");
}
/**
@@ -92,6 +85,7 @@
public static String evaluate(String expression) throws ServletException, IOException
{
WebContext wc = MgnlContext.getWebContext("Expressions can only be evaluated with a WebContext");
+
wc.getRequest().setAttribute(EXPRESSION_KEY, expression);
StringWriter sw = new StringWriter();
wc.include(EVALUATE_JSP, sw);
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2013-09-15 14:29:16 UTC (rev 4306)
@@ -19,10 +19,13 @@
package net.sourceforge.openutils.mgnlrules.samples.render;
+import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.rendering.context.RenderingContext;
import info.magnolia.rendering.engine.RenderException;
-import info.magnolia.rendering.renderer.JspRenderer;
+import info.magnolia.rendering.renderer.AbstractRenderer;
+import info.magnolia.rendering.renderer.registry.RendererRegistry;
import info.magnolia.rendering.template.RenderableDefinition;
import java.util.Map;
@@ -31,14 +34,17 @@
import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
+
/**
* Custom paragraph renderer that evaluates an expression before rendering the jsp, when a pageContext is not yet
* available. This sample uses the overload of the evaluate method that does not need a pageContext.
* @author dschivo
* @version $Id$
*/
-public class ConditionalRenderer extends JspRenderer
+public class ConditionalRenderer extends AbstractRenderer
{
/**
@@ -48,14 +54,20 @@
protected void onRender(Node content, RenderableDefinition definition, RenderingContext renderingCtx,
Map<String, Object> ctx, String templateScript) throws RenderException
{
+
String expression = PropertyUtil.getString(content, "renderCondition");
try
{
// expression evaluation without a pageContext
String result = ExpressionsElFunctions.evaluate(expression);
- if ("true".equals(result))
+ if (BooleanUtils.toBoolean(result))
{
- super.onRender(content, definition, renderingCtx, ctx, templateScript);
+
+ String templatetype = StringUtils.endsWith(templateScript, "jsp") ? "jsp" : "freemarker";
+
+ Components.getComponent(RendererRegistry.class).getRenderer(templatetype).render(renderingCtx, ctx);
+
+ // super.onRender(content, definition, renderingCtx, ctx, templateScript);
}
}
catch (Exception e)
@@ -64,4 +76,13 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected Map<String, Object> newContext()
+ {
+ return MgnlContext.getWebContext("Rules renderer can only be used with a WebContext");
+ }
+
}
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml 2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="rules" 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>88ddbc3d-9ed8-436b-babb-21a0b50f3c06</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-14T22:15:07.920+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Copied: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml (from rev 4304, magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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>88ddbc3d-9ed8-436b-babb-21a0b50f3c06</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-14T22:15:07.920+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Copied: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml (from rev 4304, magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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>97035def-7c76-4aa3-bf0f-42b26d1936b0</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlrules.samples.render.ConditionalRenderer</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-05-21T11:08:17.640+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T11:22:30.718+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-conditional" 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>b7b207c2-b832-4b7e-94d6-9e9b7536e986</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.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: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: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="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T15:44:22.300+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabConditional">
+ <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>6616ceb2-65dc-4bd5-bc10-0141cf0b9c91</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Conditional</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: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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T11:28:52.968+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="renderCondition">
+ <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>a1a14b60-9d2d-45b4-b292-d177ab277ac5</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>expression</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>A boolean expression determining if the paragraph will be rendered</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>100</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Rendering rule</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-12T17:52:36.645+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="text">
+ <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>77474442-0ff8-469b-bf76-d4062b0967ef</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Text to display</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-12T17:52:30.332+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-evaluate" 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>9d81e7ea-aa9f-4f6d-93ad-f256448d8934</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.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: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: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="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T15:44:24.547+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabEvaluate">
+ <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>f12c70da-4b71-421c-a047-053006771028</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Evaluate</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: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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:46:53.906+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="expression">
+ <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>1f75840f-078c-465f-b2cc-c97f2f0aa1e4</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>expression</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>The expression to evaluate.</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Expression</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:46:38.093+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-grid" 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>1121c87f-c169-4d3a-a66e-d49bf6efe850</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.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: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: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="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T15:44:27.495+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGrid">
+ <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>f4c9e3e4-cd31-4ecd-862d-443c31d9aad1</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Grid</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: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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-02T15:00:26.437+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="grid">
+ <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>6db4fe15-4389-4623-9ede-1a911c26a712</sv:value>
+ </sv:property>
+ <sv:property sv:name="addRowsEnabled" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>grid</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>350</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Grid</sv:value>
+ </sv:property>
+ <sv:property sv:name="rows" sv:type="Long">
+ <sv:value>10</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-02T15:00:26.437+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="columns">
+ <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>1276c6d6-a65b-4150-b775-4ad8ab5bf786</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-07-02T15:01:02.937+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-02T15:01:07.750+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="00">
+ <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>6ed43ae0-5f67-4173-9091-7d32990cdf95</sv:value>
+ </sv:property>
+ <sv:property sv:name="header" sv:type="String">
+ <sv:value>Expression</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>expression</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-05-11T18:49:01.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-07-02T15:01:52.000+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml 2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-if-then-else" 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>130a23d1-0dce-4f58-b779-07185e93417d</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.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: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: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="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-15T15:44:20.006+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabIf">
+ <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>99d8de06-a2f8-4a59-bc84-f8fea5fd0fe9</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>If</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: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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:48:59.984+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="ifCondition">
+ <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>3a32346a-76f6-4df3-b7f6-77558d610152</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>expression</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>The condition to evaluate.</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>If</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:34:23.406+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="tabThen">
+ <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>df140f3d-39c7-48bd-af2a-d5623dfc1e56</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Then</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: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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:49:12.000+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thenText">
+ <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>26abd0b9-1a82-4e03-a820-2d58dbdf0450</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>The text to display when condition is true.</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Then</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:47:17.812+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="tabElse">
+ <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>5dba476c-86ed-4119-8462-e0b8e62a6168</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Else</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: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="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:49:30.640+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="elseText">
+ <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>2e912950-f018-453a-9709-81dcaf68ea31</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>The text to display when condition is false.</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Else</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</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: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="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T09:48:51.421+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressio...
[truncated message content] |
|
From: <fg...@us...> - 2013-09-15 13:06:38
|
Revision: 4305
http://openutils.svn.sourceforge.net/openutils/?rev=4305&view=rev
Author: fgiust
Date: 2013-09-15 13:06:35 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
update samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media-grid.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-mediatag.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-playlist.xml
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media-grid.xml 2013-09-15 13:04:18 UTC (rev 4304)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media-grid.xml 2013-09-15 13:06:35 UTC (rev 4305)
@@ -12,6 +12,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>Sample grid paragraph with a column of media objects.</sv:value>
</sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>media:samples-media-grid</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -41,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>2012-04-10T10:12:27.168+02:00</sv:value>
+ <sv:value>2013-09-14T00:21:14.877+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media.xml 2013-09-15 13:04:18 UTC (rev 4304)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media.xml 2013-09-15 13:06:35 UTC (rev 4305)
@@ -12,6 +12,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>Sample media paragraph for image resizing</sv:value>
</sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>media:samples-media</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -41,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>2012-04-10T10:12:01.280+02:00</sv:value>
+ <sv:value>2013-09-14T00:22:00.518+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-mediatag.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-mediatag.xml 2013-09-15 13:04:18 UTC (rev 4304)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-mediatag.xml 2013-09-15 13:06:35 UTC (rev 4305)
@@ -12,6 +12,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>Sample media paragraph using media tag</sv:value>
</sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>media:samples-mediatag</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -41,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>2012-04-10T10:12:25.128+02:00</sv:value>
+ <sv:value>2013-09-14T00:21:44.292+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-playlist.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-playlist.xml 2013-09-15 13:04:18 UTC (rev 4304)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-playlist.xml 2013-09-15 13:06:35 UTC (rev 4305)
@@ -12,6 +12,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>Sample playlist paragraph</sv:value>
</sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>media:samples-playlist</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -41,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>2012-04-10T10:12:23.119+02:00</sv:value>
+ <sv:value>2013-09-14T00:21:29.598+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 13:04:22
|
Revision: 4304
http://openutils.svn.sourceforge.net/openutils/?rev=4304&view=rev
Author: fgiust
Date: 2013-09-15 13:04:18 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
update for magnolia 4.5 + freemarker support
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/expressions/evaluate.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/paragraph-evaluate.ftl
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-expressions/
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/template.jsp
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlexpressions/
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2013-09-15 13:04:18 UTC (rev 4304)
@@ -69,7 +69,7 @@
@Override
protected boolean accept(String resource)
{
- return super.accept(resource) && StringUtils.contains(resource, "/samples-expressions/");
+ return super.accept(resource) && StringUtils.contains(resource, "/samples-rules/");
}
});
}
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,14 +0,0 @@
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
- <description>Magnolia expressions Tags and EL functions</description>
- <display-name>Magnolia expressions Tags and EL functions</display-name>
- <tlib-version>1.0</tlib-version>
- <short-name>mexpr</short-name>
- <uri>mgnlexpressions</uri>
- <function>
- <name>evaluate</name>
- <function-class>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</function-class>
- <function-signature>java.lang.Object evaluate(java.lang.String, javax.servlet.jsp.PageContext)</function-signature>
- </function>
-</taglib>
\ No newline at end of file
Copied: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld (from rev 4303, magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,14 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <description>Magnolia expressions Tags and EL functions</description>
+ <display-name>Magnolia expressions Tags and EL functions</display-name>
+ <tlib-version>1.0</tlib-version>
+ <short-name>mexpr</short-name>
+ <uri>mgnlrules</uri>
+ <function>
+ <name>evaluate</name>
+ <function-class>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</function-class>
+ <function-signature>java.lang.Object evaluate(java.lang.String, javax.servlet.jsp.PageContext)</function-signature>
+ </function>
+</taglib>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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>88ddbc3d-9ed8-436b-babb-21a0b50f3c06</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-14T22:15:07.920+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-conditional" 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>441881dc-85ba-4469-b56e-d150067ce491</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlrules.samples.render.ConditionalRenderer</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-05-21T11:08:17.640+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-21T11:22:30.718+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-conditional" 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>6566274c-be79-4323-92ef-fce996787484</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph using a custom conditional renderer.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-expressions/paragraph-conditional.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Conditional sample for module expressions</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>samples-expressions-conditional</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-21T11:38:27.265+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-evaluate" 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>c5df50f9-8fa2-40f7-8924-dde615945122</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph evaluating an expression.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-expressions/paragraph-evaluate.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Evaluate sample for module expressions</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-21T09:51:04.328+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-grid" 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>9bec3d19-47c0-410a-9670-dfaaea1799a8</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample grid paragraph with a column of expressions.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-expressions/paragraph-grid.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Grid sample for module expressions</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-07-02T15:03:44.640+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-if-then-else" 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>6796f33b-186e-4f07-8256-d39c7a3d3544</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph choosing the text to display based on a condition.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-expressions/paragraph-if-then-else.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>If-then-else sample for module expressions</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-21T09:50:00.796+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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>97035def-7c76-4aa3-bf0f-42b26d1936b0</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlrules.samples.render.ConditionalRenderer</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-05-21T11:08:17.640+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-05-21T11:22:30.718+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-conditional" 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>986d3532-519d-425b-9002-9e2dfc0fcc7b</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph using a custom conditional renderer.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>rules:samples-rules-conditional</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>rules</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/samples-rules/paragraph-conditional.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Conditional sample for module expressions (jsp)</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-14T00:14:05.495+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-evaluate" 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>988b8fcd-48d9-4387-8edc-465a68e604af</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph evaluating an expression.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>samples-rules-evaluate</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-rules/paragraph-evaluate.ftl</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Evaluate sample for module expressions (freemarker)</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-14T00:14:21.552+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-grid" 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>718c787b-e76d-495d-b7e5-f01a07d3b59d</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample grid paragraph with a column of expressions.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>samples-rules-grid</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-rules/paragraph-grid.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Grid sample for module expressions (jsp)</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-14T00:14:37.112+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-if-then-else" 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>1ca0c5cf-10d4-4877-a4a5-b68529a88b11</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph choosing the text to display based on a condition.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>rules:samples-rules-if-then-else</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-rules/paragraph-if-then-else.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>If-then-else sample for module expressions (jsp)</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-14T00:13:41.935+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-sample-template" 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>0f82621e-b970-469f-acf0-63919fb1b6f4</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-rules/template-rules.ftl</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Rules sample template</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-09-14T00:29:21.983+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="areas">
+ <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>ef88824e-e224-4939-b235-6439fa93bdc2</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>2012-03-21T07:30:29.457+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:52:27.240+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="main">
+ <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>3f8cd8a9-e7e8-4a7e-844c-12da5b7e4307</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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>
+ </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>2012-03-21T07:30:36.643+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:52:27.241+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="availableComponents">
+ <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>6c0289af-eba3-4ee9-be8e-d870a8e35599</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>2012-03-21T07:32:04.848+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:52:27.241+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="samples-rules-grid">
+ <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>740c561f-c34c-485f-9668-d8974d278ce2</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>media:components/samples-media</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:52:50.710+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-rules-evaluate">
+ <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>6f553927-93a6-4a38-ac90-080b1e2125f5</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>media:components/samples-mediatag</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:53:04.509+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-rules-conditional">
+ <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>84f6e327-bae3-48b5-8236-9d1733a364ad</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>media:components/samples-playlist</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:53:09.034+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-rules-if-then-else">
+ <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>18d9eca7-7656-4f04-ae25-ce2cc1463d0c</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>media:components/samples-media-grid</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T22:53:13.415+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.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-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="sampleExpressions" 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>18983ea3-5ac4-466b-87d7-9125923b2224</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-expressions/template.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Expressions sample template</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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>2010-05-17T17:32:00.676+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml 2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml 2013-09-15 13:04:18 UTC (rev 4304)
@@ -32,12 +32,12 @@
<sv:value>2010-09-12T17:55:19.162+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>sampleExpressions</sv:value>
+ <sv:value>rules:pages/rules-sample-template</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="main">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:area</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -67,7 +67,7 @@
</sv:node>
<sv:node sv:name="00">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -98,13 +98,13 @@
<sv:value>2010-05-27T09:15:41.531+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples-expressions-evaluate</sv:value>
+ <sv:value>rules:components/rules-samples-evaluate</sv:value>
</sv:property>
</sv:node>
</sv:node>
<sv:node sv:name="01">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -141,12 +141,12 @@
<sv:value>2010-05-27T10:16:15.375+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples-expressions-if-then-else</sv:value>
+ <sv:value>rules:components/rules-samples-if-then-else</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="thenText_files">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -171,7 +171,7 @@
</sv:node>
<sv:node sv:name="elseText_files">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -197,7 +197,7 @@
</sv:node>
<sv:node sv:name="02">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -231,12 +231,12 @@
<sv:value>2010-09-12T17:54:33.612+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples-expressions-conditional</sv:value>
+ <sv:value>rules:components/rules-samples-conditional</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:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -262,7 +262,7 @@
</sv:node>
<sv:node sv:name="0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -275,13 +275,6 @@
magnoliaUser().name
-
-
-
-
-
-
-
</sv:...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-13 17:34:02
|
Revision: 4303
http://openutils.svn.sourceforge.net/openutils/?rev=4303&view=rev
Author: lucaboati
Date: 2013-09-13 17:33:59 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
migration to 4.5, content removed, fix examples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultGetGlobalEntriesNodeStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GetGlobalEntriesNodeStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GridPersistenceStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/PersistenceStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.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/ElementTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-form.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-message.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-textmedia.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -117,7 +117,7 @@
<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>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultGetGlobalEntriesNodeStrategy.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultGetGlobalEntriesNodeStrategy.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultGetGlobalEntriesNodeStrategy.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,8 +19,7 @@
package net.sourceforge.openutils.mgnlcontextmenu.configuration;
-import info.magnolia.cms.core.Content;
-
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.slf4j.Logger;
@@ -63,11 +62,11 @@
/**
* {@inheritDoc}
*/
- public Content getGlobalEntriesNode(Content node)
+ public Node getGlobalEntriesNode(Node node)
{
try
{
- return node.getAncestor(ancestorLevel);
+ return (Node) node.getAncestor(ancestorLevel);
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,9 +19,11 @@
package net.sourceforge.openutils.mgnlcontextmenu.configuration;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -38,15 +40,15 @@
* {@inheritDoc}
*/
@Override
- public String readEntry(Content node, String name, Scope scope)
+ public String readEntry(Node node, String name, Scope scope)
{
switch (scope)
{
case local :
- return NodeDataUtil.getString(node, name);
+ return PropertyUtil.getString(node, name);
case global :
- Content globalNode = getGlobalNode(node);
- return NodeDataUtil.getString(globalNode, name);
+ Node globalNode = getGlobalNode(node);
+ return PropertyUtil.getString(globalNode, name);
default :
return null;
}
@@ -56,7 +58,7 @@
* {@inheritDoc}
*/
@Override
- public void writeEntry(Content node, String name, String value, Scope scope) throws RepositoryException
+ public void writeEntry(Node node, String name, String value, Scope scope) throws RepositoryException
{
switch (scope)
{
@@ -64,25 +66,22 @@
setOrDelete(node, name, value);
break;
case global :
- Content globalNode = getGlobalNode(node);
+ Node globalNode = getGlobalNode(node);
setOrDelete(globalNode, name, value);
- globalNode.updateMetaData();
+ MetaDataUtil.updateMetaData(globalNode);
break;
}
}
- protected void setOrDelete(Content node, String name, String value) throws RepositoryException
+ protected void setOrDelete(Node node, String name, String value) throws RepositoryException
{
if (!StringUtils.isEmpty(value))
{
- NodeDataUtil.getOrCreateAndSet(node, name, value);
+ node.setProperty(name, value);
}
else
{
- if (node != null && node.hasNodeData(name))
- {
- node.deleteNodeData(name);
- }
+ NodeUtilsExt.deletePropertyIfExist(node, name);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GetGlobalEntriesNodeStrategy.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GetGlobalEntriesNodeStrategy.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GetGlobalEntriesNodeStrategy.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlcontextmenu.configuration;
-import info.magnolia.cms.core.Content;
+import javax.jcr.Node;
/**
@@ -38,5 +38,5 @@
* @param node
* @return
*/
- Content getGlobalEntriesNode(Content node);
+ Node getGlobalEntriesNode(Node node);
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GridPersistenceStrategy.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GridPersistenceStrategy.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GridPersistenceStrategy.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,21 +19,23 @@
package net.sourceforge.openutils.mgnlcontextmenu.configuration;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import it.openutils.mgnlutils.el.MgnlUtilsElFunctions;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -43,6 +45,11 @@
public class GridPersistenceStrategy extends PersistenceStrategy
{
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(GridPersistenceStrategy.class);
+
private static final String LOCAL_CACHE_KEY = GridPersistenceStrategy.class.getName() + ".localCache";
private static final String GLOBAL_CACHE_KEY = GridPersistenceStrategy.class.getName() + ".globalCache";
@@ -55,7 +62,7 @@
* {@inheritDoc}
*/
@Override
- public String readEntry(Content node, String name, Scope scope)
+ public String readEntry(Node node, String name, Scope scope)
{
switch (scope)
{
@@ -72,7 +79,7 @@
* {@inheritDoc}
*/
@Override
- public void writeEntry(Content node, String name, String value, Scope scope) throws RepositoryException
+ public void writeEntry(Node node, String name, String value, Scope scope) throws RepositoryException
{
switch (scope)
{
@@ -80,7 +87,7 @@
update(node, LOCAL_PROPERTY_NAME, name, value, getLocalEntries(node), false);
break;
case global :
- Content globalNode = getGlobalNode(node);
+ Node globalNode = getGlobalNode(node);
update(globalNode, GLOBAL_PROPERTY_NAME, name, value, getGlobalEntries(node), true);
break;
}
@@ -94,7 +101,7 @@
* @return
*/
@SuppressWarnings("unchecked")
- protected Map<String, String> getGlobalEntries(Content node)
+ protected Map<String, String> getGlobalEntries(Node node)
{
ServletContext servletContext = MgnlContext.getWebContext().getServletContext();
Map map = (Map) servletContext.getAttribute(GLOBAL_CACHE_KEY);
@@ -103,10 +110,22 @@
map = new HashMap();
servletContext.setAttribute(GLOBAL_CACHE_KEY, map);
}
- Content globalNode = getGlobalNode(node);
- String mapKey = globalNode.getUUID();
+ Node globalNode = getGlobalNode(node);
+ String mapKey = StringUtils.EMPTY;
+ try
+ {
+ mapKey = globalNode.getIdentifier();
+ }
+ catch (UnsupportedOperationException e)
+ {
+ log.error(e.getMessage());
+ }
+ catch (RepositoryException re)
+ {
+ log.error("Exception caught", re);
+ }
GlobalCache globalCache = (GlobalCache) map.get(mapKey);
- Calendar modificationDate = globalNode.getMetaData().getModificationDate();
+ Calendar modificationDate = MetaDataUtil.getMetaData(globalNode).getModificationDate();
if (globalCache != null && globalCache.getCreationDate().compareTo(modificationDate) < 0)
{
globalCache = null;
@@ -126,7 +145,7 @@
* @return
*/
@SuppressWarnings("unchecked")
- protected Map<String, String> getLocalEntries(Content node)
+ protected Map<String, String> getLocalEntries(Node node)
{
HttpServletRequest request = MgnlContext.getWebContext().getRequest();
Map map = (Map) request.getAttribute(LOCAL_CACHE_KEY);
@@ -135,7 +154,20 @@
map = new HashMap();
request.setAttribute(LOCAL_CACHE_KEY, map);
}
- String mapKey = node.getUUID();
+ String mapKey = StringUtils.EMPTY;
+ try
+ {
+ mapKey = node.getIdentifier();
+ }
+ catch (UnsupportedOperationException e)
+ {
+ log.error(e.getMessage());
+ }
+ catch (RepositoryException re)
+ {
+ log.error("Exception caught", re);
+ }
+
Map<String, String> contents = (Map<String, String>) map.get(mapKey);
if (contents == null)
{
@@ -146,9 +178,9 @@
return contents;
}
- private static void collectEntries(Content node, String propertyName, Map<String, String> entries)
+ private static void collectEntries(Node node, String propertyName, Map<String, String> entries)
{
- String propertyValue = NodeDataUtil.getString(node, propertyName);
+ String propertyValue = PropertyUtil.getString(node, propertyName);
if (!StringUtils.isEmpty(propertyValue))
{
for (String[] entry : MgnlUtilsElFunctions.splitAndTokenize(propertyValue))
@@ -161,15 +193,14 @@
}
}
- private void update(Content node, String propertyName, String name, String value, Map<String, String> entries,
+ private void update(Node node, String propertyName, String name, String value, Map<String, String> entries,
boolean updateMetaData) throws RepositoryException
{
value = StringUtils.remove(StringUtils.replaceChars(value, "\n\t", " "), '\r');
boolean changed = StringUtils.isEmpty(value) ? entries.containsKey(name) : !value.equals(entries.get(name));
if (changed)
{
- NodeData property = NodeDataUtil.getOrCreate(node, propertyName);
- String propertyValue = property.getString();
+ String propertyValue = PropertyUtil.getString(node, propertyName);
String[][] array = StringUtils.isEmpty(propertyValue) ? new String[0][] : MgnlUtilsElFunctions
.splitAndTokenize(propertyValue);
StringBuilder sb = new StringBuilder();
@@ -205,10 +236,11 @@
}
sb.append(name).append('\t').append(value);
}
- property.setValue(new String(sb));
+
+ node.setProperty(propertyName, new String(sb));
if (updateMetaData)
{
- node.updateMetaData();
+ MetaDataUtil.updateMetaData(node);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/PersistenceStrategy.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/PersistenceStrategy.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/PersistenceStrategy.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,9 +19,9 @@
package net.sourceforge.openutils.mgnlcontextmenu.configuration;
-import info.magnolia.cms.core.Content;
-import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule;
@@ -43,7 +43,7 @@
* @param name
* @return the entry value
*/
- public String readEntry(Content node, String name)
+ public String readEntry(Node node, String name)
{
String value = readEntry(node, name, Scope.local);
if (StringUtils.isEmpty(value))
@@ -60,7 +60,7 @@
* @param scope
* @return the entry value
*/
- public abstract String readEntry(Content node, String name, Scope scope);
+ public abstract String readEntry(Node node, String name, Scope scope);
/**
* Writes an entry in the given scope.
@@ -69,16 +69,16 @@
* @param value
* @param scope
*/
- public abstract void writeEntry(Content node, String name, String value, Scope scope) throws RepositoryException;
+ public abstract void writeEntry(Node node, String name, String value, Scope scope) throws RepositoryException;
/**
* Gets the global entries node for the given node, using the strategy configured in the contextmenu module.
* @param node
* @return
*/
- protected Content getGlobalNode(Content node)
+ protected Node getGlobalNode(Node node)
{
- ContextMenuModule module = ModuleRegistry.Factory.getInstance().getModuleInstance(ContextMenuModule.class);
+ ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
GetGlobalEntriesNodeStrategy strategy = module.getGetGlobalEntriesNodeStrategy();
return strategy != null ? strategy.getGlobalEntriesNode(node) : null;
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,10 +19,11 @@
package net.sourceforge.openutils.mgnlcontextmenu.dialog;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.RequestFormUtil;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
+import javax.jcr.Node;
import javax.servlet.http.HttpServletRequest;
import net.sourceforge.openutils.mgnlcontextmenu.configuration.PersistenceStrategy;
@@ -39,13 +40,13 @@
public class DialogControlUtils
{
- public static String getValue(HttpServletRequest request, Content node, String scope)
+ public static String getValue(HttpServletRequest request, Node node, String scope)
{
String name = new RequestFormUtil(request).getParameter("entryName");
String value = null;
if (name != null)
{
- ContextMenuModule module = ModuleRegistry.Factory.getInstance().getModuleInstance(ContextMenuModule.class);
+ ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
if (strategy != null)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -52,7 +52,10 @@
{
if (this.value == null)
{
- this.value = DialogControlUtils.getValue(request, getStorageNode(), getConfigValue("scope", "local"));
+ this.value = DialogControlUtils.getValue(
+ request,
+ getStorageNode().getJCRNode(),
+ getConfigValue("scope", "local"));
}
return this.value;
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -25,6 +25,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.FieldSaveHandler;
+import info.magnolia.objectfactory.Components;
import javax.jcr.RepositoryException;
@@ -54,14 +55,15 @@
entryValue = null;
}
- ContextMenuModule module = ModuleRegistry.Factory.getInstance().getModuleInstance(ContextMenuModule.class);
+ ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
if (strategy != null)
{
- strategy.writeEntry(parentNode, entryName, entryValue, Enum.valueOf(Scope.class, NodeDataUtil.getString(
- configNode,
- "scope",
- "local")));
+ strategy.writeEntry(
+ parentNode.getJCRNode(),
+ entryName,
+ entryValue,
+ Enum.valueOf(Scope.class, NodeDataUtil.getString(configNode, "scope", "local")));
}
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -52,7 +52,10 @@
{
if (this.value == null)
{
- this.value = DialogControlUtils.getValue(request, getStorageNode(), getConfigValue("scope", "local"));
+ this.value = DialogControlUtils.getValue(
+ request,
+ getStorageNode().getJCRNode(),
+ getConfigValue("scope", "local"));
}
return this.value;
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -53,7 +53,10 @@
{
if (this.value == null)
{
- this.value = DialogControlUtils.getValue(request, getStorageNode(), getConfigValue("scope", "local"));
+ this.value = DialogControlUtils.getValue(
+ request,
+ getStorageNode().getJCRNode(),
+ getConfigValue("scope", "local"));
}
return this.value;
}
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-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -19,8 +19,12 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
-import info.magnolia.cms.core.Content;
-import info.magnolia.module.ModuleRegistry;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
+import info.magnolia.objectfactory.Components;
+
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcontextmenu.configuration.PersistenceStrategy;
import net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule;
@@ -46,11 +50,13 @@
* @param name
* @return a local contents entry value if found, or a global contents one if found, otherwise null
*/
- public static String entryValue(Content node, String name)
+ public static String entryValue(Node node, String name)
{
- ContextMenuModule module = ModuleRegistry.Factory.getInstance().getModuleInstance(ContextMenuModule.class);
+ ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
- return strategy != null ? strategy.readEntry(node, name) : null;
+ // LB crazy command! mgnl argsss
+ Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
+ return strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null;
}
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-13 17:33:59 UTC (rev 4303)
@@ -28,6 +28,7 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jcr.Node;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -53,7 +54,7 @@
private String menu;
- private Content node;
+ private Node node;
private String wrapper;
@@ -83,7 +84,7 @@
* Sets the node.
* @param node the node to set
*/
- public void setNode(Content node)
+ public void setNode(Node node)
{
this.node = node;
}
@@ -112,7 +113,7 @@
@Override
public int doStartTag() throws JspException
{
- Content node = this.node != null ? this.node : currentParagraph();
+ Node node = this.node != null ? this.node : currentParagraph();
boolean readonly = this.readonly || !canEdit();
if (!readonly)
{
@@ -155,7 +156,7 @@
@Override
public int doEndTag() throws JspException
{
- Content node = this.node != null ? this.node : currentParagraph();
+ Node node = this.node != null ? this.node : currentParagraph();
boolean readonly = this.readonly || !canEdit();
if (!readonly)
{
@@ -168,7 +169,7 @@
throw new JspException(e);
}
- ElementInfo info = addElementInfo(node.getHandle(), elementId);
+ ElementInfo info = addElementInfo(NodeUtil.getPathIfPossible(node), elementId);
if (!StringUtils.isEmpty(name))
{
info.setEntryName(name);
@@ -201,9 +202,9 @@
return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
}
- private Content currentParagraph()
+ private Node currentParagraph()
{
- return MgnlContext.getAggregationState().getCurrentContent();
+ return MgnlContext.getAggregationState().getCurrentContent().getJCRNode();
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-13 17:33:59 UTC (rev 4303)
@@ -66,7 +66,7 @@
<name>node</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- <type>info.magnolia.cms.core.Content</type>
+ <type>javax.jcr.Node</type>
</attribute>
<attribute>
<description>
@@ -104,6 +104,6 @@
</description>
<name>entryValue</name>
<function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
- <function-signature>java.lang.String entryValue(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+ <function-signature>java.lang.String entryValue(javax.jcr.Node, java.lang.String)</function-signature>
</function>
</taglib>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-form.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-form.xml 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-form.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-contextmenu-form" 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>9c276274-2a48-4113-aa4f-653ac07854cb</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph showing a form where field labels and hints can be edited via context menu on labels.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-contextmenu/paragraph-form.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Form sample for module contextmenu</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-19T17:30:06.859+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-message.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-message.xml 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-message.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-contextmenu-message" 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>83483500-da3b-41bf-a5ea-1ce24830b782</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph showing a message which can be edited via context menu.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-contextmenu/paragraph-message.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Message sample for module contextmenu</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-19T17:29:06.640+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-textmedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-textmedia.xml 2013-09-13 16:52:30 UTC (rev 4302)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.paragraphs.samples-contextmenu-textmedia.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-contextmenu-textmedia" 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>034d522b-4417-491f-b914-b4ed6a720724</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph showing a text and media, both be editable via context menu.</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/templates/samples-contextmenu/paragraph-textmedia.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Text-media sample for module contextmenu</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</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-25T12:45:26.721+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-20T14:50:58.953+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-contextmenu-form" 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>9c276214-2a48-4113-aa4f-653ac07854cb</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph showing a form where field labels and hints can be edited via context menu on labels.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>contextmenu:samples-contextmenu-form</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-contextmenu/paragraph-form.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Form sample for module contextmenu</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T19:26:18.358+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-contextmenu-message" 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>81483500-da3b-41bf-a5ea-1ce24830b782</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph showing a message which can be edited via context menu.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>contextmenu:samples-contextmenu-message</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-contextmenu/paragraph-message.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Message sample for module contextmenu</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T19:25:35.319+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-contextmenu-textmedia" 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>031d522b-4417-491f-b914-b4ed6a720724</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph showing a text and media, both be editable via context menu.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>contextmenu:samples-contextmenu-textmedia</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-contextmenu/paragraph-textmedia.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Text-media sample for module contextmenu</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-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T19:26:31.070+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml 2013-09-13 17:33:59 UTC (rev 4303)
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sampleContextMenu" 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>0581824a-e17f-47ea-9035-3dcc8df430ce</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-contextmenu/template.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Context menu sample template</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-09-13T13:05:57.000+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="areas">
+ <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>4abf9065-e505-4dad-aa38-4ba4cd20fc6c</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>2012-03-21T07:30:29.457+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T13:06:07.585+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="main">
+ <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>f2422716-9c0f-4ae2-af0c-e5aad9d76915</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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>
+ </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>2012-03-21T07:30:36.643+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T13:06:07.586+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="availableComponents">
+ <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>84b27713-7935-40d7-8f7a-7cc00bca8306</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>2012-03-21T07:32:04.848+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T13:06:07.586+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-form">
+ <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>ebfab1d3-1f3c-4c09-b3ff-e943cca2ac65</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-form</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T13:07:19.790+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-message">
+ <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>63001b21-2a17-4e2d-adcf-7832a6f7e196</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-message</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>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-13T13:07:35.289+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="samples-contextmenu-textmedia">
+ <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>f2db7c6b-f951-4f55-85ba-78dc031db297</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-textmedia</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:prop...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-13 16:52:34
|
Revision: 4302
http://openutils.svn.sourceforge.net/openutils/?rev=4302&view=rev
Author: lucaboati
Date: 2013-09-13 16:52:30 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
NodeUtilsExt moved on MgnlUtils
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/
Added: 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 (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-13 16:52:30 UTC (rev 4302)
@@ -0,0 +1,123 @@
+/**
+ *
+ * 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.api;
+
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.PropertyUtil;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
+ */
+public class NodeUtilsExt
+{
+
+ public static boolean exists(Session session, String absolutepath)
+ {
+ try
+ {
+ return session.getRootNode().hasNode(StringUtils.stripStart(absolutepath, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeIfExists(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ return session.getNode(absolutepath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ return null;
+ }
+
+ public static boolean deleteIfExisting(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ session.getNode(absolutepath).remove();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean setPropertyIfDifferent(Node node, String propertyname, Object propertyvalue)
+ {
+ return setPropertyIfDifferentFromValue(node, propertyname, propertyvalue, propertyvalue);
+ }
+
+ public static boolean setPropertyIfDifferentFromValue(Node node, String propertyname, Object propertyvalue,
+ Object oldvalue)
+ {
+ try
+ {
+ if (!node.hasProperty(propertyname)
+ || oldvalue == null
+ || !StringUtils.equals(node.getProperty(propertyname).getString(), oldvalue.toString()))
+ {
+ PropertyUtil.setProperty(node, propertyname, propertyvalue);
+ return true;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return false;
+ }
+
+ public static void deletePropertyIfExist(Node node, String propertyname)
+ {
+ try
+ {
+ if (node != null && node.hasProperty(propertyname))
+ {
+ node.getProperty(propertyname).remove();
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 16:25:25
|
Revision: 4301
http://openutils.svn.sourceforge.net/openutils/?rev=4301&view=rev
Author: lucaboati
Date: 2013-09-13 16:25:21 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
createPath used instead of getNodeIfExists
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-13 10:42:28 UTC (rev 4300)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-13 16:25:21 UTC (rev 4301)
@@ -19,11 +19,12 @@
package it.openutils.mgnltasks;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -48,7 +49,7 @@
private final String propertyName;
private final Object propertyValue;
-
+
private Logger log = LoggerFactory.getLogger(CreateMissingPropertyTask.class);
@Deprecated
@@ -89,12 +90,7 @@
{
Session session = ctx.getJCRSession(workspaceName);
- Node node = NodeUtilsExt.getNodeIfExists(session, nodePath);
- if (node == null)
- {
- log.info("Node {} not found, nothing to do", nodePath);
- return;
- }
+ Node node = NodeUtil.createPath(session.getRootNode(), nodePath, MgnlNodeType.NT_CONTENT);
if (!node.hasProperty(propertyName))
{
PropertyUtil.setProperty(node, propertyName, propertyValue);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4300
http://openutils.svn.sourceforge.net/openutils/?rev=4300&view=rev
Author: lucaboati
Date: 2013-09-13 10:42:28 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
fix bootstrap template and website
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml 2013-09-13 10:33:41 UTC (rev 4299)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml 2013-09-13 10:42:28 UTC (rev 4300)
@@ -12,7 +12,7 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
+ <sv:property sv:name="templateScript" sv:type="String">
<sv:value>/templates/samples-contextmenu/template.jsp</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 10:33:46
|
Revision: 4299
http://openutils.svn.sourceforge.net/openutils/?rev=4299&view=rev
Author: lucaboati
Date: 2013-09-13 10:33:41 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
fix bootstrap template and website
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml 2013-09-13 10:26:51 UTC (rev 4298)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.sampleContextMenu.xml 2013-09-13 10:33:41 UTC (rev 4299)
@@ -18,7 +18,7 @@
<sv:property sv:name="title" sv:type="String">
<sv:value>Context menu sample template</sv:value>
</sv:property>
- <sv:property sv:name="type" sv:type="String">
+ <sv:property sv:name="renderType" sv:type="String">
<sv:value>jsp</sv:value>
</sv:property>
<sv:property sv:name="visible" sv:type="String">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-13 10:26:51 UTC (rev 4298)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-13 10:33:41 UTC (rev 4299)
@@ -32,7 +32,7 @@
<sv:value>2010-05-20T14:57:52.156+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>sampleContextMenu</sv:value>
+ <sv:value>contextmenu:sampleContextMenu</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="main">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 10:26:55
|
Revision: 4298
http://openutils.svn.sourceforge.net/openutils/?rev=4298&view=rev
Author: lucaboati
Date: 2013-09-13 10:26:51 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
templatePath to templateScript
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html 2013-09-13 09:56:25 UTC (rev 4297)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html 2013-09-13 10:26:51 UTC (rev 4298)
@@ -58,16 +58,15 @@
${paragraph.dialog}
</a>
</td>
- <td>${paragraph.templatePath}</td>
+ <td>${paragraph.templateScript}</td>
<td>${this.messages.get(paragraph.title)}</td>
<td>${this.messages.get(paragraph.description)}</td>
[#else]
<th align="left" scope="row">${paragraph.name}</th>
<td>${paragraph.dialog}</td>
- <td>${paragraph.templatePath}</td>
- <!-- <td>${paragraph.type}</td>-->
- <td></td>
- <td></td>
+ <td>${paragraph.templateScript}</td>
+ <td><!-- --></td>
+ <td><!-- --></td>
[/#if]
</tr>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html 2013-09-13 09:56:25 UTC (rev 4297)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html 2013-09-13 10:26:51 UTC (rev 4298)
@@ -51,13 +51,13 @@
<a href="javascript:MgnlAdminCentral.showTree('config','${this.getDialogPath(paragraph.name)}')" >(D)</a>
</th>
- <td>${paragraph.templatePath}</td>
+ <td>${paragraph.templateScript}</td>
<td>${paragraph.strutsType}</td>
<td>${this.messages.get(paragraph.title)}</td>
<td>${this.messages.get(paragraph.description)}</td>
[#else]
<th align="left" scope="row">${paragraph.name}</th>
- <td>${paragraph.templatePath}</td>
+ <td>${paragraph.templateScript}</td>
<td>${paragraph.strutsType}</td>
<td> </td>
<td> </td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 09:56:29
|
Revision: 4297
http://openutils.svn.sourceforge.net/openutils/?rev=4297&view=rev
Author: lucaboati
Date: 2013-09-13 09:56:25 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
fix NPE
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-13 09:26:48 UTC (rev 4296)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-13 09:56:25 UTC (rev 4297)
@@ -29,7 +29,10 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Set a nodedata if not existing. Also creates the full path if missing.
* @author fgiust
@@ -45,6 +48,8 @@
private final String propertyName;
private final Object propertyValue;
+
+ private Logger log = LoggerFactory.getLogger(CreateMissingPropertyTask.class);
@Deprecated
public CreateMissingPropertyTask(
@@ -85,7 +90,11 @@
Session session = ctx.getJCRSession(workspaceName);
Node node = NodeUtilsExt.getNodeIfExists(session, nodePath);
-
+ if (node == null)
+ {
+ log.info("Node {} not found, nothing to do", nodePath);
+ return;
+ }
if (!node.hasProperty(propertyName))
{
PropertyUtil.setProperty(node, propertyName, propertyValue);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 09:26:52
|
Revision: 4296
http://openutils.svn.sourceforge.net/openutils/?rev=4296&view=rev
Author: lucaboati
Date: 2013-09-13 09:26:48 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
fix logger class
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 20:50:49 UTC (rev 4295)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-13 09:26:48 UTC (rev 4296)
@@ -58,7 +58,7 @@
private final String nodetype;
- private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+ private Logger log = LoggerFactory.getLogger(BaseCheckMissingTask.class);
/**
* @param templateOrParagraph "template" or "paragraph"
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-12 20:50:49 UTC (rev 4295)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-13 09:26:48 UTC (rev 4296)
@@ -41,7 +41,7 @@
private String folderName;
- private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+ private Logger log = LoggerFactory.getLogger(BootstrapMissingNodesTask.class);
/**
* Bootstrap all the files included in the /mgnl-bootstrap/(folder) directory, only if the nodes are not already
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-12 20:50:53
|
Revision: 4295
http://openutils.svn.sourceforge.net/openutils/?rev=4295&view=rev
Author: fgiust
Date: 2013-09-12 20:50:49 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-12 20:50:49 UTC (rev 4295)
@@ -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">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -68,6 +69,16 @@
</build>
<dependencies>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlutils</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
<version>${magnolia.version}</version>
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,23 +19,27 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+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;
@@ -78,20 +82,27 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- QueryManager configQueryManager = installContext
- .getHierarchyManager(RepositoryConstants.CONFIG)
- .getQueryManager();
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.CONFIG)
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENTNODE))
+ .addOrder(Order.desc("@jcr:score"));
- Collection<Content> templates = configQueryManager
- .createQuery("//modules/*/" + templateOrParagraph + "s/*", Query.XPATH)
- .execute()
- .getContent("mgnl:contentNode");
+ if (StringUtils.equals(templateOrParagraph, "template"))
+ {
+ criteria.setBasePath("//modules/*/templates/pages/*");
+ }
+ else
+ {
+ criteria.setBasePath("//modules/*/templates/components/*");
+ }
+ AdvancedResult result = criteria.execute();
+
List<String> templ = new ArrayList<String>();
- Iterator<Content> availableTemplates = templates.iterator();
- while (availableTemplates.hasNext())
+
+ for (AdvancedResultItem template : result.getItems())
{
- Content template = availableTemplates.next();
templ.add(template.getName());
}
@@ -109,47 +120,29 @@
private void checkInvalidPages(InstallContext installContext, List<String> templates) throws RepositoryException,
InvalidQueryException
{
- Session hm = installContext.getJCRSession(RepositoryConstants.WEBSITE);
- QueryManager qm = hm.getQueryManager();
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.eq("@jcr:primaryType", nodetype))
+ .add(Restrictions.not(Restrictions.in("MetaData/mgnl:template", templates)))
+ .addOrder(Order.desc("@jcr:score"));
- StringBuilder query = new StringBuilder("//*[jcr:primaryType='"
- + this.nodetype
- + "' and MetaData/mgnl:template and not(");
+ log.debug("Running query: {}", criteria.toXpathExpression());
- Iterator<String> nameIterator = templates.iterator();
- while (nameIterator.hasNext())
- {
- String template = nameIterator.next();
+ AdvancedResult result = criteria.execute();
- query.append("MetaData/mgnl:template='");
- query.append(template);
- query.append("'");
- if (nameIterator.hasNext())
- {
- query.append(" or ");
- }
- }
-
- query.append(")]");
-
- String queryAAsString = query.toString();
-
- log.debug("Running query: {}", queryAAsString);
-
- Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent(this.nodetype);
-
int count = 0;
StringBuilder sb = new StringBuilder();
- for (Content page : nodes)
+ for (Node page : result.getItems())
{
- String template = page.getMetaData().getTemplate();
+ String template = MetaDataUtil.getTemplate(page);
if (StringUtils.isNotEmpty(template))
{
count++;
- sb.append(page.getHandle());
+ sb.append(page.getPath());
sb.append(" ");
sb.append(template);
sb.append("\n");
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,17 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import java.util.Collection;
-
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -70,11 +66,11 @@
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
Session hm = ctx.getJCRSession(RepositoryConstants.USER_ROLES);
- final Node parentNode = hm.getNode("/");
+ final Node parentNode = hm.getRootNode();
- final Collection<Content> childNodes = ContentUtil.collectAllChildren(parentNode, ItemType.ROLE);
+ Iterable<Node> childNodes = NodeUtil.getNodes(parentNode, MgnlNodeType.ROLE);
- for (Content content : childNodes)
+ for (Node content : childNodes)
{
operateOnChildNode(content, ctx);
}
@@ -85,19 +81,19 @@
* @param ctx Context
* @throws RepositoryException for any exception wile operating on the repository
*/
- protected void operateOnChildNode(Content node, InstallContext ctx) throws RepositoryException
+ protected void operateOnChildNode(Node node, InstallContext ctx) throws RepositoryException
{
String aclpath = "acl_" + repository;
- if (!node.hasContent(aclpath))
+ if (!node.hasNode(aclpath))
{
log.info("adding permissions on {} to role {}", repository, node.getName());
- Content aclnode = node.createContent(aclpath, MgnlNodeType.NT_CONTENTNODE);
- Content permNode = aclnode.createContent("0", MgnlNodeType.NT_CONTENTNODE);
- permNode.createNodeData("path", "/*");
- permNode.createNodeData("permissions", new Long(permissions));
+ Node aclnode = node.addNode(aclpath, MgnlNodeType.NT_CONTENTNODE);
+ Node permNode = aclnode.addNode("0", MgnlNodeType.NT_CONTENTNODE);
+ permNode.setProperty("path", "/*");
+ permNode.setProperty("permissions", permissions);
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -72,12 +72,12 @@
* {@inheritDoc}
*/
@Override
- protected boolean skipResource(String name)
+ protected boolean skipResource(InstallContext installContext, String name) throws RepositoryException
{
// export the current node in the repository to a temporary file; compare it with the new bootstrap; only if the
// files are different import the new file (the previous node gets automatically deleted), else skip
// it.
- boolean unchanged = bootstrapResourceEqualsExisting(name);
+ boolean unchanged = bootstrapResourceEqualsExisting(installContext, name);
if (unchanged)
{
log.debug("Skipping file {}", name);
@@ -110,7 +110,7 @@
for (Node childNode : NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE))
{
- String fileName = childNode.getHierarchyManager().getName()
+ String fileName = childNode.getSession().getWorkspace().getName()
+ childNode.getPath().replace("/", ".")
+ ".xml";
String resourceToBootstrap = "/mgnl-bootstrap/" + modulename + "/" + fileName;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -69,22 +69,6 @@
includedRepositories.add("config");
}
- @Deprecated
- public ModuleConfigBootstrapTask(String modulename, List<String> excludeRepositories)
- {
- super("Bootstrap", "Bootstraps module configuration for " + modulename + " (will not overwrite website!).");
- this.modulename = modulename;
-
- log
- .warn("\n\n****************************\n"
- + "ModuleConfigBootstrapTask has changed in openutils-mgnltasks 4.1\n"
- + "By default only the config repository is bootstrapped, and you need to specificy *additional* repositories only if needed."
- + "The constructor with List<String> (excluded repositories) is now deprecated, you can use the default one or the one with the\n"
- + "Set<String> incleded repositories parameter\n"
- + "****************************\n");
-
- }
-
public ModuleConfigBootstrapTask(String modulename, Set<String> includedRepositories)
{
super("Bootstrap", "Bootstraps module configuration for "
@@ -127,7 +111,7 @@
* {@inheritDoc}
*/
@Override
- public void execute(final InstallContext installContext) throws TaskExecutionException
+ public void execute(InstallContext installContext) throws TaskExecutionException
{
try
{
@@ -144,7 +128,7 @@
List<String> filteredResources = new ArrayList<String>();
for (String name : resourcesToBootstrap)
{
- if (!skipResource(name))
+ if (!skipResource(installContext, name))
{
filteredResources.add(name);
}
@@ -169,7 +153,7 @@
* @param name
* @return
*/
- protected boolean skipResource(String name)
+ protected boolean skipResource(InstallContext installContext, String name) throws RepositoryException
{
return false;
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,20 +19,22 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import java.util.Collection;
-
import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,31 +76,27 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.WEBSITE);
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT))
+ .add(Restrictions.eq("MetaData/mgnl:template", actualTemplate))
+ .addOrder(Order.desc("@jcr:score"));
- QueryManager qm = hm.getQueryManager();
+ log.debug("Running query: {}", criteria.toXpathExpression());
- StringBuilder query = new StringBuilder("//*[MetaData/mgnl:template ='");
- query.append(actualTemplate);
- query.append("']");
+ AdvancedResult result = criteria.execute();
- String queryAAsString = query.toString();
-
- log.debug("Running query: {}", queryAAsString);
-
- Collection<Content> nodes = qm
- .createQuery(queryAAsString, Query.XPATH)
- .execute()
- .getContent(MgnlNodeType.NT_CONTENTNODE.getSystemName());
-
- for (Content page : nodes)
+ for (AdvancedResultItem page : result.getItems())
{
- log.warn(
- "Replacing template " + page.getMetaData().getTemplate() + " with {} in {}",
+ log.warn("Replacing template {} with {} in {}", new Object[]{
+ MetaDataUtil.getTemplate(page),
newTemplate,
- page.getHandle());
- page.getMetaData().setTemplate(newTemplate);
+ page.getHandle() });
+
+ MetaDataUtil.getMetaData(page).setTemplate(newTemplate);
}
+
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,19 +19,22 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import java.util.Collection;
-
import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,28 +76,25 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.WEBSITE);
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE))
+ .add(Restrictions.not(Restrictions.eq("MetaData/mgnl:template", actualTemplate)))
+ .addOrder(Order.desc("@jcr:score"));
- QueryManager qm = hm.getQueryManager();
+ log.debug("Running query: {}", criteria.toXpathExpression());
- StringBuilder query = new StringBuilder("//*[MetaData/mgnl:template ='");
- query.append(actualTemplate);
- query.append("']");
+ AdvancedResult result = criteria.execute();
- String queryAAsString = query.toString();
-
- log.debug("Running query: {}", queryAAsString);
-
- Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent();
-
- for (Content page : nodes)
+ for (AdvancedResultItem page : result.getItems())
{
- log.warn(
- "Replacing template " + page.getMetaData().getTemplate() + " with {} in {}",
+ log.warn("Replacing template {} with {} in {}", new Object[]{
+ MetaDataUtil.getTemplate(page),
newTemplate,
- page.getHandle());
- page.getMetaData().setTemplate(newTemplate);
+ page.getHandle() });
+
+ MetaDataUtil.getMetaData(page).setTemplate(newTemplate);
}
}
-
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
@@ -51,7 +50,6 @@
*/
public void execute(final InstallContext ctx) throws TaskExecutionException
{
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
{
@@ -59,7 +57,7 @@
{
ctx.warn(message);
}
- }, hm);
+ }, ctx.getConfigHierarchyManager());
try
{
extractor.extractFiles(new FileExtractor.Transformer()
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,9 +19,7 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -31,7 +29,9 @@
import java.util.Comparator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -67,24 +67,20 @@
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- Content parent = installContext.getHierarchyManager(repository).getContent(parentNode);
+ Session session = installContext.getJCRSession(repository);
- List<Content> children = (List<Content>) ContentUtil.getAllChildren(parent);
+ Node parent = session.getNode(parentNode);
+ List<Node> children = NodeUtil.asList(NodeUtil.getNodes(parent, NodeUtil.EXCLUDE_META_DATA_FILTER));
- if (children.isEmpty())
- {
- children = (List<Content>) parent.getChildren(MgnlNodeType.NT_CONTENTNODE);
- }
-
final List<String> orderedList = Arrays.asList(nodesOrder);
- Collections.sort(children, new Comparator<Content>()
+ Collections.sort(children, new Comparator<Node>()
{
- public int compare(Content o1, Content o2)
+ public int compare(Node o1, Node o2)
{
- Integer index1 = orderedList.indexOf(o1.getName());
- Integer index2 = orderedList.indexOf(o2.getName());
+ Integer index1 = orderedList.indexOf(NodeUtil.getName(o1));
+ Integer index2 = orderedList.indexOf(NodeUtil.getName(o2));
if (index1 < 0)
{
index1 = Integer.MAX_VALUE;
@@ -98,9 +94,9 @@
}
});
- Content previous = null;
+ Node previous = null;
- for (Content content : children)
+ for (Node content : children)
{
if (previous != null)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,12 +19,12 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Delta;
import info.magnolia.module.delta.DeltaBuilder;
import info.magnolia.module.model.Version;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.util.ArrayList;
import java.util.HashSet;
@@ -73,27 +73,6 @@
}
/**
- * Add a repository to bootstrap exclusion list
- * @param repository repository to exclude from bootstrap
- */
- @Deprecated
- public void addExcludeRepositoryFromBootstrap(String repository)
- {
- if (!includedRepositoriesInBootstrap.contains(repository))
- {
- log
- .warn(
- "The behaviour of SimpleModuleVersionHandler has changed in order to bootstrap only the config repository by default.\n"
- + "You should not specificy anymore excluded repository, and you can use addIncludedRepositoryInBootstrap to add more.",
- new Exception("(This exception has been added to highlight the importance of this warning)"));
- }
- else
- {
- includedRepositoriesInBootstrap.remove(repository);
- }
- }
-
- /**
* Add a repository to bootstrap *inclusion* list
* @param repository repository to include in bootstrap
*/
@@ -120,10 +99,10 @@
.add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
// only for development, add the (module)-dev bootstrap directory
- if (SystemProperty.getBooleanProperty("magnolia.develop"))
+ if (MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop"))
{
- if (StringUtils.isEmpty(SystemProperty.getProperty("magnolia.bootstrapdev"))
- || StringUtils.contains(SystemProperty.getProperty("magnolia.bootstrapdev"), ctx
+ if (StringUtils.isEmpty(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"))
+ || StringUtils.contains(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"), ctx
.getCurrentModuleDefinition()
.getName()))
{
@@ -143,7 +122,7 @@
List<Delta> deltas = new ArrayList<Delta>();
- if (SystemProperty.getBooleanProperty(modulename + ".update.disabled"))
+ if (MgnlUtilsDeprecatedAdapters.getBooleanProperty(modulename + ".update.disabled"))
{
return deltas;
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
/**
* Copyright Openmind http://www.openmindonline.it
*
@@ -37,15 +36,14 @@
*/
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -68,16 +66,16 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- // make sure we have the /modules node
- if (!ctx.hasModulesNode())
- {
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
- hm.createContent("/", "modules", MgnlNodeType.NT_CONTENT.getSystemName());
- }
+ Node modules = NodeUtil.createPath(
+ ctx.getJCRSession(RepositoryConstants.CONFIG).getRootNode(),
+ "modules",
+ MgnlNodeType.NT_CONTENT);
- final Content moduleNode = ctx.getOrCreateCurrentModuleNode();
- final NodeData nodeData = NodeDataUtil.getOrCreate(moduleNode, "version");
- nodeData.setValue(ctx.getCurrentModuleDefinition().getVersion().toString());
+ Node moduleNode = NodeUtil.createPath(
+ modules,
+ ctx.getCurrentModuleDefinition().getName(),
+ MgnlNodeType.NT_CONTENT);
+
+ moduleNode.setProperty("version", ctx.getCurrentModuleDefinition().getVersion().toString());
}
-
}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,23 +19,22 @@
package it.openutils.mgnltasks.dev;
-import info.magnolia.cms.beans.config.ContentRepository;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.AlertUtil;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.importexport.DataTransporter;
+import info.magnolia.jcr.predicate.AbstractPredicate;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import info.magnolia.repository.RepositoryManager;
import java.io.File;
import java.io.FileNotFoundException;
@@ -47,6 +46,8 @@
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
@@ -269,15 +270,15 @@
@SuppressWarnings("unchecked")
public Iterator<String> getRepositories()
{
- return ContentRepository.getAllRepositoryNames();
+ return Components.getComponent(RepositoryManager.class).getWorkspaceNames().iterator();
}
public Set<String> getModules()
{
- return ModuleRegistry.Factory.getInstance().getModuleNames();
+ return Components.getComponent(ModuleRegistry.class).getModuleNames();
}
- public String backup()
+ public String backup() throws RepositoryException
{
Session hm = MgnlContext.getJCRSession(RepositoryConstants.CONFIG);
Session session = hm.getWorkspace().getSession();
@@ -287,25 +288,25 @@
Node moduleroot = hm.getNode("/modules/" + module);
if (templates)
{
- exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "templates", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "templates", new String[]{
MgnlNodeType.NT_CONTENT,
MgnlNodeType.NT_CONTENTNODE }, false);
}
if (paragraphs)
{
- exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "paragraphs", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "paragraphs", new String[]{
MgnlNodeType.NT_CONTENT,
MgnlNodeType.NT_CONTENTNODE }, false);
}
if (pages)
{
- exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "pages", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "pages", new String[]{
MgnlNodeType.NT_CONTENT,
MgnlNodeType.NT_CONTENTNODE }, false);
}
if (dialogs)
{
- exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "dialogs", new ItemType[]{
+ exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "dialogs", new String[]{
MgnlNodeType.NT_CONTENT,
MgnlNodeType.NT_CONTENTNODE }, true);
}
@@ -316,7 +317,7 @@
session,
moduleroot,
"virtualURIMapping",
- new ItemType[]{MgnlNodeType.NT_CONTENTNODE },
+ new String[]{MgnlNodeType.NT_CONTENTNODE },
true);
}
AlertUtil.setMessage("Backup done to "
@@ -333,12 +334,12 @@
extractWorkspaceRoots(RepositoryConstants.WEBSITE);
}
- if (media && ContentRepository.getRepositoryMapping("media") != null)
+ if (media && Components.getComponent(RepositoryManager.class).hasWorkspace("media"))
{
extractWorkspaceRoots("media");
}
- if (data && ContentRepository.getRepositoryMapping("data") != null)
+ if (data && Components.getComponent(RepositoryManager.class).hasWorkspace("data"))
{
extractWorkspaceRoots("data");
}
@@ -366,14 +367,15 @@
try
{
Session hm = MgnlContext.getJCRSession(repositoryName);
- Content wesiteRoot = hm.getRoot();
+ Node wesiteRoot = hm.getRootNode();
- Iterator<Content> children = wesiteRoot.getChildren(ContentUtil.MAGNOLIA_FILTER).iterator();
- while (children.hasNext())
+ Iterable<Node> children = NodeUtil.getNodes(wesiteRoot, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node node : children)
{
- Content exported = children.next();
- exportNode(repositoryName, hm.getWorkspace().getSession(), exported, true);
+ exportNode(repositoryName, hm.getWorkspace().getSession(), node, true);
}
+
}
catch (Exception e)
{
@@ -382,7 +384,7 @@
}
}
- private void backupChildren(String repository, String parentpath)
+ private void backupChildren(String repository, String parentpath) throws RepositoryException
{
Session hm = MgnlContext.getJCRSession(repository);
@@ -398,12 +400,10 @@
}
try
{
- Iterator<Content> children = parentNode
- .getChildren(ContentUtil.ALL_NODES_EXCEPT_JCR_CONTENT_FILTER)
- .iterator();
- while (children.hasNext())
+ Iterable<Node> children = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node exported : children)
{
- Content exported = children.next();
exportNode(repository, hm.getWorkspace().getSession(), exported, false);
}
@@ -416,14 +416,14 @@
}
- private void exportChildren(String repository, Session session, Content moduleroot, String path,
- ItemType[] itemTypes, boolean exportContentContainingContentNodes) throws PathNotFoundException,
+ private void exportChildren(String repository, Session session, Node moduleroot, String path,
+ final String[] itemTypes, boolean exportContentContainingContentNodes) throws PathNotFoundException,
RepositoryException, AccessDeniedException, FileNotFoundException, IOException
{
- Content templateRoot = null;
+ Node templateRoot = null;
try
{
- templateRoot = moduleroot.getContent(path);
+ templateRoot = moduleroot.getNode(path);
}
catch (PathNotFoundException e)
{
@@ -434,15 +434,55 @@
// we need to track exported paths, or it will export any single control for dialogs
Set<String> alreadyExported = new HashSet<String>();
- Iterator<Content> children = ContentUtil.collectAllChildren(templateRoot, itemTypes).iterator();
- while (children.hasNext())
+ Iterable<Node> children = NodeUtil.getNodes(templateRoot, new AbstractPredicate<Node>()
{
- Content exported = children.next();
- if (!exported.getNodeDataCollection().isEmpty() // ignore "directories"
- || (exportContentContainingContentNodes && exported.hasChildren(MgnlNodeType.NT_CONTENTNODE.getSystemName())))
+
+ @Override
+ public boolean evaluateTyped(Node node)
{
+ for (String type : itemTypes)
+ {
+ try
+ {
+ if (node.getPrimaryNodeType().getName().equals(type))
+ {
+ return true;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ return false;
+ }
+ }
+ return false;
+ }
- String current = exported.getHandle();
+ });
+
+ for (Node node : children)
+ {
+ boolean hasproperties = false;
+
+ PropertyIterator properties = node.getProperties();
+
+ while (properties.hasNext())
+ {
+ Property property = properties.nextProperty();
+ if (!StringUtils.contains(property.getName(), "."))
+ {
+ hasproperties = true;
+ break;
+ }
+ }
+
+ if (!hasproperties
+ || (exportContentContainingContentNodes && NodeUtil
+ .getNodes(node, MgnlNodeType.NT_CONTENTNODE)
+ .iterator()
+ .hasNext()))
+ {
+
+ String current = node.getPath();
boolean dontexport = false;
for (Iterator<String> iterator = alreadyExported.iterator(); iterator.hasNext();)
@@ -457,17 +497,17 @@
if (!dontexport)
{
- alreadyExported.add(exported.getHandle() + "/");
- exportNode(repository, session, exported, false);
+ alreadyExported.add(node.getPath() + "/");
+ exportNode(repository, session, node, false);
}
}
}
}
- private void exportNode(String repository, Session session, Content exported, boolean dev)
- throws FileNotFoundException, IOException
+ private void exportNode(String repository, Session session, Node exported, boolean dev) throws IOException,
+ RepositoryException
{
- String handle = exported.getHandle();
+ String handle = exported.getPath();
String xmlName = repository + StringUtils.replace(handle, "/", ".") + ".xml";
xmlName = DataTransporter.encodePath(xmlName, ".", "UTF-8");
// create necessary parent directories
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-09-12 20:50:49 UTC (rev 4295)
@@ -115,11 +115,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
<version>5.0.1</version>
</dependency>
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-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,14 +19,14 @@
package it.openutils.mgnlutils.setup;
-import it.openutils.mgnltasks.DiffSimpleModuleVersionHandler;
+import info.magnolia.module.DefaultModuleVersionHandler;
/**
* @author fgiust
* @version $Id$
*/
-public class MgnlUtilsModuleVersionHandler extends DiffSimpleModuleVersionHandler
+public class MgnlUtilsModuleVersionHandler extends DefaultModuleVersionHandler
{
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-12 16:08:38
|
Revision: 4294
http://openutils.svn.sourceforge.net/openutils/?rev=4294&view=rev
Author: fgiust
Date: 2013-09-12 16:08:35 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 16:00:44 UTC (rev 4293)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 16:08:35 UTC (rev 4294)
@@ -19,10 +19,9 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.ContentUtil;
import info.magnolia.importexport.DataTransporter;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnlutils.api.NodeUtilsExt;
@@ -109,18 +108,18 @@
}
}
- for (Content childNode : node.getChildren(MgnlNodeType.NT_CONTENTNODE))
+ for (Node childNode : NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE))
{
String fileName = childNode.getHierarchyManager().getName()
- + childNode.getHandle().replace("/", ".")
+ + childNode.getPath().replace("/", ".")
+ ".xml";
String resourceToBootstrap = "/mgnl-bootstrap/" + modulename + "/" + fileName;
// delete only the templates not available anymore (just to handle the template removal/renaming, should
// not be a common case)
if (!lookup.contains(resourceToBootstrap))
{
- log.warn("Deleting node {}", childNode.getHandle());
- childNode.delete();
+ log.warn("Deleting node {}", childNode.getPath());
+ childNode.remove();
}
}
}
@@ -150,12 +149,14 @@
return new String[]{repository, fullPath };
}
- private boolean bootstrapResourceEqualsExisting(String name)
+ private boolean bootstrapResourceEqualsExisting(InstallContext installContext, String name)
+ throws RepositoryException
{
String[] repositoryAndPath = getRepositoryAndPathFromBootstrapName(name);
String repository = repositoryAndPath[0];
String path = repositoryAndPath[1];
- Content content = ContentUtil.getContent(repository, path);
+
+ Node content = NodeUtilsExt.getNodeIfExists(installContext.getJCRSession(repository), path);
if (content != null)
{
File file = null;
@@ -192,7 +193,7 @@
return false;
}
- private File exportToTempFile(Content content, String filenameWithoutExtension) throws IOException,
+ private File exportToTempFile(Node content, String filenameWithoutExtension) throws IOException,
FileNotFoundException, RepositoryException
{
File file = File.createTempFile(filenameWithoutExtension + '-', ".xml");
@@ -200,14 +201,10 @@
FileOutputStream out = new FileOutputStream(file);
try
{
- DataTransporter.executeExport(
- out,
- false,
- true,
- content.getWorkspace().getSession(),
- content.getHandle(),
- content.getHierarchyManager().getName(),
- DataTransporter.XML);
+ DataTransporter.executeExport(out, false, true, content.getSession(), content.getPath(), content
+ .getSession()
+ .getWorkspace()
+ .getName(), DataTransporter.XML);
}
finally
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-12 16:00:47
|
Revision: 4293
http://openutils.svn.sourceforge.net/openutils/?rev=4293&view=rev
Author: fgiust
Date: 2013-09-12 16:00:44 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 15:54:10 UTC (rev 4292)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 16:00:44 UTC (rev 4293)
@@ -19,7 +19,7 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.NodeData;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.Task;
@@ -79,12 +79,11 @@
Node role = hm.getNode(user);
- NodeData pwdNodeData = role.getNodeData("pswd");
- String actualPassword = pwdNodeData.getString();
+ String actualPassword = PropertyUtil.getString(role, "pswd");
if (StringUtils.equals(defaultPassword, StringUtils.trim(actualPassword)))
{
log.info("Found default password for {}, setting new password", user);
- pwdNodeData.setValue(newpassword);
+ role.setProperty("pswd", newpassword);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2013-09-12 15:54:10 UTC (rev 4292)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2013-09-12 16:00:44 UTC (rev 4293)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.Task;
@@ -90,23 +89,8 @@
}
/**
- * Check if a nodedata exists with a specific value.
* @param session JCR session
* @param handle node handle
- * @param nodedata nodedata name
- * @param value expected value for nodeData
- * @return <code>true</code> if nodedata has the same value
- * @throws RepositoryException exceptions while checking content
- */
- public boolean nodeDataEquals(Session session, String handle, String nodedata, Object value)
- throws RepositoryException
- {
- return value.equals(NodeDataUtil.getValueObject(session.getNode(handle).getNodeData(nodedata)));
- }
-
- /**
- * @param session JCR session
- * @param handle node handle
* @return <code>true</code> if the task must be executed
* @throws RepositoryException exceptions while checking content
*/
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-12 15:54:10 UTC (rev 4292)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-12 16:00:44 UTC (rev 4293)
@@ -19,13 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -82,12 +82,13 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- Session hm = ctx.getJCRSession(workspaceName);
+ Session session = ctx.getJCRSession(workspaceName);
- final Content node = ContentUtil.createPath(hm, nodePath, false);
- if (!node.hasNodeData(propertyName))
+ Node node = NodeUtilsExt.getNodeIfExists(session, nodePath);
+
+ if (!node.hasProperty(propertyName))
{
- NodeDataUtil.getOrCreateAndSet(node, propertyName, propertyValue);
+ PropertyUtil.setProperty(node, propertyName, propertyValue);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-12 15:54:14
|
Revision: 4292
http://openutils.svn.sourceforge.net/openutils/?rev=4292&view=rev
Author: fgiust
Date: 2013-09-12 15:54:10 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations (warning, compile broken)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/api/
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -20,7 +20,6 @@
package it.openutils.mgnltasks;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.module.InstallContext;
@@ -34,6 +33,7 @@
import java.util.List;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
import org.apache.commons.lang.StringUtils;
@@ -82,9 +82,10 @@
.getHierarchyManager(RepositoryConstants.CONFIG)
.getQueryManager();
- Collection<Content> templates = configQueryManager.createQuery(
- "//modules/*/" + templateOrParagraph + "s/*",
- Query.XPATH).execute().getContent("mgnl:contentNode");
+ Collection<Content> templates = configQueryManager
+ .createQuery("//modules/*/" + templateOrParagraph + "s/*", Query.XPATH)
+ .execute()
+ .getContent("mgnl:contentNode");
List<String> templ = new ArrayList<String>();
Iterator<Content> availableTemplates = templates.iterator();
@@ -108,7 +109,7 @@
private void checkInvalidPages(InstallContext installContext, List<String> templates) throws RepositoryException,
InvalidQueryException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.WEBSITE);
+ Session hm = installContext.getJCRSession(RepositoryConstants.WEBSITE);
QueryManager qm = hm.getQueryManager();
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,13 +19,12 @@
package it.openutils.mgnltasks;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.BootstrapResourcesTask;
+
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import info.magnolia.jcr.util.NodeUtil;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.BootstrapResourcesTask;
-
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,8 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
@@ -28,7 +26,9 @@
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -75,9 +75,9 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USERS);
+ Session hm = installContext.getJCRSession(RepositoryConstants.USERS);
- Content role = hm.getContent(user);
+ Node role = hm.getNode(user);
NodeData pwdNodeData = role.getNodeData("pswd");
String actualPassword = pwdNodeData.getString();
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,20 +19,18 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.Content.ContentFilter;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
-import java.util.Collection;
-
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
-import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -53,6 +51,8 @@
private final Object previousPropertyValue;
+ private Logger log = LoggerFactory.getLogger(ChangePropertyForEachChildrenTask.class);
+
public ChangePropertyForEachChildrenTask(
String workspaceName,
String nodePath,
@@ -81,30 +81,22 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- final HierarchyManager hm = ctx.getHierarchyManager(workspaceName);
+ Session hm = ctx.getJCRSession(workspaceName);
- final Content parentnode = ContentUtil.createPath(hm, nodePath, false);
+ Node parentnode = NodeUtilsExt.getNodeIfExists(hm, nodePath);
+ if (parentnode == null)
+ {
+ log.info("Node {} not found, nothing to do", nodePath);
+ return;
+ }
- Collection<Content> children = parentnode.getChildren(new ContentFilter()
+ Iterable<Node> children = NodeUtil.getNodes(parentnode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node node : children)
{
- public boolean accept(Content content)
- {
- return true;
- }
- });
- for (Content node : children)
- {
- if (node.hasNodeData(propertyName) || previousPropertyValue == null)
- {
- String currentvalue = node.getNodeData(propertyName).getString();
- if (previousPropertyValue != null
- && StringUtils.equals(currentvalue, previousPropertyValue.toString())
- || !StringUtils.equals(currentvalue, newPropertyValue.toString()))
- {
- NodeDataUtil.getOrCreateAndSet(node, propertyName, newPropertyValue);
- }
- }
+ NodeUtilsExt.setPropertyIfDifferentFromValue(node, propertyName, newPropertyValue, previousPropertyValue);
+
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.BootstrapSingleResource;
@@ -29,6 +28,7 @@
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -61,11 +61,11 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USER_GROUPS);
+ Session session = installContext.getJCRSession(RepositoryConstants.USER_GROUPS);
try
{
- hm.getContent(group);
+ session.getRootNode().getNode(group);
}
catch (PathNotFoundException e)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.BootstrapSingleResource;
@@ -29,6 +28,7 @@
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -61,11 +61,11 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USER_ROLES);
+ Session hm = installContext.getJCRSession(RepositoryConstants.USER_ROLES);
try
{
- hm.getContent(role);
+ hm.getNode(role);
}
catch (PathNotFoundException e)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.BootstrapSingleResource;
@@ -29,6 +28,7 @@
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -61,11 +61,11 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.USERS);
+ Session hm = installContext.getJCRSession(RepositoryConstants.USERS);
try
{
- hm.getContent(user);
+ hm.getNode(user);
}
catch (PathNotFoundException e)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
@@ -29,6 +28,7 @@
import java.util.List;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -72,10 +72,10 @@
*/
public void execute(InstallContext installContext) throws TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(workspace);
try
{
- if (verifyCondition(hm, handle))
+ Session session = installContext.getJCRSession(workspace);
+ if (verifyCondition(session, handle))
{
for (Task t : tasks)
{
@@ -90,50 +90,26 @@
}
/**
- * Check if a node exists.
- * @param hm HieararchyManager
- * @param handle node handle
- * @return <code>true</code> if node exists
- */
- public boolean existsNode(HierarchyManager hm, String handle)
- {
- return hm.isExist(handle);
- }
-
- /**
- * Check if a nodedata exists.
- * @param hm HieararchyManager
- * @param handle node handle
- * @param nodedata nodedata name
- * @return <code>true</code> if nodedata exists
- * @throws RepositoryException exceptions while checking content
- */
- public boolean existsNodedata(HierarchyManager hm, String handle, String nodedata) throws RepositoryException
- {
- return hm.getContent(handle).hasNodeData(nodedata);
- }
-
- /**
* Check if a nodedata exists with a specific value.
- * @param hm HieararchyManager
+ * @param session JCR session
* @param handle node handle
* @param nodedata nodedata name
* @param value expected value for nodeData
* @return <code>true</code> if nodedata has the same value
* @throws RepositoryException exceptions while checking content
*/
- public boolean nodeDataEquals(HierarchyManager hm, String handle, String nodedata, Object value)
+ public boolean nodeDataEquals(Session session, String handle, String nodedata, Object value)
throws RepositoryException
{
- return value.equals(NodeDataUtil.getValueObject(hm.getContent(handle).getNodeData(nodedata)));
+ return value.equals(NodeDataUtil.getValueObject(session.getNode(handle).getNodeData(nodedata)));
}
/**
- * @param hm HieararchyManager
+ * @param session JCR session
* @param handle node handle
* @return <code>true</code> if the task must be executed
* @throws RepositoryException exceptions while checking content
*/
- public abstract boolean verifyCondition(HierarchyManager hm, String handle) throws RepositoryException;
+ public abstract boolean verifyCondition(Session session, String handle) throws RepositoryException;
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -20,8 +20,8 @@
package it.openutils.mgnltasks;
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.util.ContentUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
@@ -30,7 +30,9 @@
import java.util.Collection;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,8 +69,8 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = ctx.getHierarchyManager(RepositoryConstants.USER_ROLES);
- final Content parentNode = hm.getContent("/");
+ Session hm = ctx.getJCRSession(RepositoryConstants.USER_ROLES);
+ final Node parentNode = hm.getNode("/");
final Collection<Content> childNodes = ContentUtil.collectAllChildren(parentNode, ItemType.ROLE);
@@ -92,8 +94,8 @@
{
log.info("adding permissions on {} to role {}", repository, node.getName());
- Content aclnode = node.createContent(aclpath, ItemType.CONTENTNODE);
- Content permNode = aclnode.createContent("0", ItemType.CONTENTNODE);
+ Content aclnode = node.createContent(aclpath, MgnlNodeType.NT_CONTENTNODE);
+ Content permNode = aclnode.createContent("0", MgnlNodeType.NT_CONTENTNODE);
permNode.createNodeData("path", "/*");
permNode.createNodeData("permissions", new Long(permissions));
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -20,7 +20,6 @@
package it.openutils.mgnltasks;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.InstallContext;
@@ -28,6 +27,7 @@
import info.magnolia.module.delta.TaskExecutionException;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -82,7 +82,7 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- final HierarchyManager hm = ctx.getHierarchyManager(workspaceName);
+ Session hm = ctx.getJCRSession(workspaceName);
final Content node = ContentUtil.createPath(hm, nodePath, false);
if (!node.hasNodeData(propertyName))
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,12 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -57,12 +58,9 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(workspaceName);
+ Session hm = installContext.getJCRSession(workspaceName);
- if (hm.isExist(nodePath))
- {
- hm.delete(nodePath);
- }
+ NodeUtilsExt.deleteIfExisting(hm, nodePath);
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -20,12 +20,12 @@
package it.openutils.mgnltasks;
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.util.ContentUtil;
import info.magnolia.importexport.DataTransporter;
import info.magnolia.module.InstallContext;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import java.io.File;
import java.io.FileInputStream;
@@ -36,7 +36,9 @@
import java.util.HashSet;
import java.util.Set;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -90,11 +92,11 @@
@Override
protected void deleteNode(InstallContext installContext, String nodePath) throws RepositoryException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.CONFIG);
+ Session hm = installContext.getJCRSession(RepositoryConstants.CONFIG);
- if (hm.isExist(nodePath))
+ if (NodeUtilsExt.exists(hm, nodePath))
{
- Content node = hm.getContent(nodePath);
+ Node node = hm.getNode(nodePath);
Set<String> lookup = new HashSet<String>();
for (String name : resourcesToBootstrap)
@@ -107,7 +109,7 @@
}
}
- for (Content childNode : node.getChildren(ItemType.CONTENTNODE))
+ for (Content childNode : node.getChildren(MgnlNodeType.NT_CONTENTNODE))
{
String fileName = childNode.getHierarchyManager().getName()
+ childNode.getHandle().replace("/", ".")
@@ -145,9 +147,7 @@
pathName = "/" + StringUtils.replace(pathName, ".", "/");
fullPath = pathName + "/" + nodeName;
}
- return new String[]{
- repository, fullPath
- };
+ return new String[]{repository, fullPath };
}
private boolean bootstrapResourceEqualsExisting(String name)
@@ -200,8 +200,14 @@
FileOutputStream out = new FileOutputStream(file);
try
{
- DataTransporter.executeExport(out, false, true, content.getWorkspace().getSession(), content
- .getHandle(), content.getHierarchyManager().getName(), DataTransporter.XML);
+ DataTransporter.executeExport(
+ out,
+ false,
+ true,
+ content.getWorkspace().getSession(),
+ content.getHandle(),
+ content.getHierarchyManager().getName(),
+ DataTransporter.XML);
}
finally
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,18 +19,17 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
-import java.util.List;
-
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -56,22 +55,21 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.CONFIG);
+ Session session = installContext.getJCRSession(RepositoryConstants.CONFIG);
- if (hm.isExist(subscribersPath))
+ if (NodeUtilsExt.exists(session, subscribersPath))
{
- Content subscribersNode = hm.getContent(subscribersPath);
- List<Content> subscribers = ContentUtil.collectAllChildren(subscribersNode);
+ Node subscribersNode = session.getNode(subscribersPath);
- for (Content content : subscribers)
+ Iterable<Node> subscribers = NodeUtil.getNodes(subscribersNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node node : subscribers)
{
- NodeData nd = content.getNodeData("active");
- if (nd.getBoolean())
+ if (PropertyUtil.getBoolean(node, "active", true))
{
- nd.setValue(false);
+ node.setProperty("active", false);
}
-
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,10 +19,14 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.BootstrapResourcesTask;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,9 +84,19 @@
String handle = StringUtils.substringAfter(name, "/mgnl-bootstrap/" + folderName + "/" + workspace + ".");
handle = StringUtils.substringBeforeLast(handle, ".xml");
handle = "/" + StringUtils.replace(handle, ".", "/");
- HierarchyManager hm = installContext.getHierarchyManager(workspace);
- boolean alreadyExisting = hm.isExist(handle);
+ Session session;
+ try
+ {
+ session = installContext.getJCRSession(workspace);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
+ boolean alreadyExisting = NodeUtilsExt.exists(session, handle);
+
if (!alreadyExisting)
{
log.info("Loading {} since no content at {}:{} has been found", new Object[]{name, workspace, handle });
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,11 +19,12 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.importexport.BootstrapUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.BootstrapResourcesTask;
import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import java.io.IOException;
import java.util.ArrayList;
@@ -33,6 +34,7 @@
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -181,12 +183,11 @@
protected void deleteNode(InstallContext installContext, String nodePath) throws RepositoryException
{
- HierarchyManager hm = installContext.getHierarchyManager("config");
+ Session hm = installContext.getJCRSession(RepositoryConstants.CONFIG);
- if (hm.isExist(nodePath))
+ if (NodeUtilsExt.deleteIfExisting(hm, nodePath))
{
- log.warn("Deleting node {}", nodePath);
- hm.delete(nodePath);
+ log.warn("Deleted node {}", nodePath);
}
}
}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -19,10 +19,8 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -31,9 +29,13 @@
import java.util.Comparator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import org.apache.commons.lang.StringUtils;
+
/**
* Sorts a list of nodes alphabetically.
* @author fgiust
@@ -68,42 +70,39 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = ctx.getHierarchyManager(repository);
- Content parent = hm.getContent(node);
- List<Content> children = (List<Content>) ContentUtil.getAllChildren(parent);
+ Session session = ctx.getJCRSession(repository);
- if (children.isEmpty())
- {
- children = (List<Content>) parent.getChildren(ItemType.CONTENTNODE);
- }
+ Node parent = session.getNode(node);
+ List<Node> children = NodeUtil.asList(NodeUtil.getNodes(parent, NodeUtil.EXCLUDE_META_DATA_FILTER));
if (this.property == null)
{
- Collections.sort(children, new Comparator<Content>()
+ Collections.sort(children, new Comparator<Node>()
{
- public int compare(Content o1, Content o2)
+ public int compare(Node o1, Node o2)
{
- return o2.getName().compareTo(o1.getName());
+ return NodeUtil.getName(o2).compareTo(NodeUtil.getName(o1));
}
});
}
else
{
- Collections.sort(children, new Comparator<Content>()
+ Collections.sort(children, new Comparator<Node>()
{
- public int compare(Content o1, Content o2)
+ public int compare(Node o1, Node o2)
{
- return o2.getNodeData(property).getString().compareTo(o1.getNodeData(property).getString());
+ return StringUtils.defaultString(PropertyUtil.getString(o2, property)).compareTo(
+ StringUtils.defaultString(PropertyUtil.getString(o1, property)));
}
});
}
- Content previous = null;
+ Node previous = null;
- for (Content content : children)
+ for (Node content : children)
{
if (previous != null)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -21,7 +21,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.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.module.InstallContext;
@@ -89,7 +89,7 @@
Collection<Content> nodes = qm
.createQuery(queryAAsString, Query.XPATH)
.execute()
- .getContent(ItemType.CONTENTNODE.getSystemName());
+ .getContent(MgnlNodeType.NT_CONTENTNODE.getSystemName());
for (Content page : nodes)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -20,7 +20,7 @@
package it.openutils.mgnltasks;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
@@ -73,7 +73,7 @@
if (children.isEmpty())
{
- children = (List<Content>) parent.getChildren(ItemType.CONTENTNODE);
+ children = (List<Content>) parent.getChildren(MgnlNodeType.NT_CONTENTNODE);
}
final List<String> orderedList = Arrays.asList(nodesOrder);
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -25,6 +25,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -73,11 +74,7 @@
Node node = NodeUtil.createPath(session.getRootNode(), nodePath, MgnlNodeType.NT_CONTENT);
- if (!node.hasProperty(propertyName)
- || !StringUtils.equals(node.getProperty(propertyName).getString(), newPropertyValue.toString()))
- {
- PropertyUtil.setProperty(node, propertyName, newPropertyValue);
- }
+ NodeUtilsExt.setPropertyIfDifferent(node, propertyName, newPropertyValue);
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -39,7 +39,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.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.InstallContext;
@@ -72,7 +72,7 @@
if (!ctx.hasModulesNode())
{
final HierarchyManager hm = ctx.getConfigHierarchyManager();
- hm.createContent("/", "modules", ItemType.CONTENT.getSystemName());
+ hm.createContent("/", "modules", MgnlNodeType.NT_CONTENT.getSystemName());
}
final Content moduleNode = ctx.getOrCreateCurrentModuleNode();
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 13:53:09 UTC (rev 4291)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.config.ContentRepository;
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;
@@ -280,35 +279,35 @@
public String backup()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(RepositoryConstants.CONFIG);
+ Session hm = MgnlContext.getJCRSession(RepositoryConstants.CONFIG);
Session session = hm.getWorkspace().getSession();
try
{
- Content moduleroot = hm.getContent("/modules/" + module);
+ Node moduleroot = hm.getNode("/modules/" + module);
if (templates)
{
exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "templates", new ItemType[]{
- ItemType.CONTENT,
- ItemType.CONTENTNODE }, false);
+ MgnlNodeType.NT_CONTENT,
+ MgnlNodeType.NT_CONTENTNODE }, false);
}
if (paragraphs)
{
exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "paragraphs", new ItemType[]{
- ItemType.CONTENT,
- ItemType.CONTENTNODE }, false);
+ MgnlNodeType.NT_CONTENT,
+ MgnlNodeType.NT_CONTENTNODE }, false);
}
if (pages)
{
exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "pages", new ItemType[]{
- ItemType.CONTENT,
- ItemType.CONTENTNODE }, false);
+ MgnlNodeType.NT_CONTENT,
+ MgnlNodeType.NT_CONTENTNODE }, false);
}
if (dialogs)
{
exportChildren(RepositoryConstants.CONFIG, session, moduleroot, "dialogs", new ItemType[]{
- ItemType.CONTENT,
- ItemType.CONTENTNODE }, true);
+ MgnlNodeType.NT_CONTENT,
+ MgnlNodeType.NT_CONTENTNODE }, true);
}
if (virtualURIs)
{
@@ -317,7 +316,7 @@
session,
moduleroot,
"virtualURIMapping",
- new ItemType[]{ItemType.CONTENTNODE },
+ new ItemType[]{MgnlNodeType.NT_CONTENTNODE },
true);
}
AlertUtil.setMessage("Backup done to "
@@ -366,7 +365,7 @@
{
try
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(repositoryName);
+ Session hm = MgnlContext.getJCRSession(repositoryName);
Content wesiteRoot = hm.getRoot();
Iterator<Content> children = wesiteRoot.getChildren(ContentUtil.MAGNOLIA_FILTER).iterator();
@@ -385,12 +384,12 @@
private void backupChildren(String repository, String parentpath)
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(repository);
+ Session hm = MgnlContext.getJCRSession(repository);
- Content parentNode = null;
+ Node parentNode = null;
try
{
- parentNode = hm.getContent(parentpath);
+ parentNode = hm.getNode(parentpath);
}
catch (RepositoryException e)
{
@@ -440,7 +439,7 @@
{
Content exported = children.next();
if (!exported.getNodeDataCollection().isEmpty() // ignore "directories"
- || (exportContentContainingContentNodes && exported.hasChildren(ItemType.CONTENTNODE.getSystemName())))
+ || (exportContentContainingContentNodes && exported.hasChildren(MgnlNodeType.NT_CONTENTNODE.getSystemName())))
{
String current = exported.getHandle();
Added: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-12 15:54:10 UTC (rev 4292)
@@ -0,0 +1,108 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.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 it.openutils.mgnlutils.api;
+
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.PropertyUtil;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class NodeUtilsExt
+{
+
+ public static boolean exists(Session session, String absolutepath)
+ {
+ try
+ {
+ return session.getRootNode().hasNode(StringUtils.stripStart(absolutepath, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeIfExists(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ return session.getNode(absolutepath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ return null;
+ }
+
+ public static boolean deleteIfExisting(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ session.getNode(absolutepath).remove();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean setPropertyIfDifferent(Node node, String propertyname, Object propertyvalue)
+ {
+ return setPropertyIfDifferentFromValue(node, propertyname, propertyvalue, propertyvalue);
+ }
+
+ public static boolean setPropertyIfDifferentFromValue(Node node, String propertyname, Object propertyvalue,
+ Object oldvalue)
+ {
+ try
+ {
+ if (!node.hasProperty(propertyname)
+ || oldvalue == null
+ || !StringUtils.equals(node.getProperty(propertyname).getString(), oldvalue.toString()))
+ {
+ PropertyUtil.setProperty(node, propertyname, propertyvalue);
+ return true;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return false;
+ }
+}
Property changes on: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-12 13:53:13
|
Revision: 4291
http://openutils.svn.sourceforge.net/openutils/?rev=4291&view=rev
Author: fgiust
Date: 2013-09-12 13:53:09 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java 2013-09-12 13:51:30 UTC (rev 4290)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java 2013-09-12 13:53:09 UTC (rev 4291)
@@ -19,15 +19,16 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.commons.lang.StringUtils;
@@ -78,15 +79,14 @@
@Override
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
- final HierarchyManager hm = ctx.getHierarchyManager(workspaceName);
+ Session session = ctx.getJCRSession(workspaceName);
- final Content node = ContentUtil.createPath(hm, nodePath, false);
- if (node.hasNodeData(propertyName))
+ Node node = NodeUtil.createPath(session.getRootNode(), nodePath, MgnlNodeType.NT_CONTENT);
+
+ if (node.hasProperty(propertyName)
+ && !StringUtils.equals(node.getProperty(propertyName).getString(), newPropertyValue.toString()))
{
- if (StringUtils.equals(node.getNodeData(propertyName).getString(), previousPropertyValue.toString()))
- {
- NodeDataUtil.getOrCreateAndSet(node, propertyName, newPropertyValue);
- }
+ PropertyUtil.setProperty(node, propertyName, newPropertyValue);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
