You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <die...@us...> - 2012-04-10 09:45:20
|
Revision: 3951 http://openutils.svn.sourceforge.net/openutils/?rev=3951&view=rev Author: diego_schivo Date: 2012-04-10 09:45:10 +0000 (Tue, 10 Apr 2012) Log Message: ----------- mgnl:area Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2012-04-10 09:34:57 UTC (rev 3950) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2012-04-10 09:45:10 UTC (rev 3951) @@ -68,7 +68,7 @@ </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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -422,7 +422,7 @@ </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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -567,7 +567,7 @@ </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:multiple="true"> <sv:value>mix:lockable</sv:value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 09:35:08
|
Revision: 3950 http://openutils.svn.sourceforge.net/openutils/?rev=3950&view=rev Author: diego_schivo Date: 2012-04-10 09:34:57 +0000 (Tue, 10 Apr 2012) Log Message: ----------- paragraph-grid.jsp Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2012-04-10 09:24:40 UTC (rev 3949) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2012-04-10 09:34:57 UTC (rev 3950) @@ -3,6 +3,7 @@ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> + <c:set var="node" value="${mu:node(content, 'website')}" /> <table cellspacing="0" border="1"> <thead> <tr> @@ -10,7 +11,7 @@ </tr> </thead> <tbody> - <c:forEach var="row" items="${mu:splitAndTokenize(content.grid)}"> + <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}"> <tr> <td> <media:media item="${row[0]}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 09:24:51
|
Revision: 3949 http://openutils.svn.sourceforge.net/openutils/?rev=3949&view=rev Author: diego_schivo Date: 2012-04-10 09:24:40 +0000 (Tue, 10 Apr 2012) Log Message: ----------- paragraph-playlist.jsp Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2012-04-10 09:22:13 UTC (rev 3948) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2012-04-10 09:24:40 UTC (rev 3949) @@ -4,7 +4,7 @@ xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <div class="textImage"> - <cms:setNode var="playlistNode" path="${content.playlist}" repository="playlists" /> + <c:set var="playlistNode" value="${mu:node(content.playlist, 'playlists')}" /> <div> <h3>${playlistNode.title}</h3> <div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 09:22:24
|
Revision: 3948 http://openutils.svn.sourceforge.net/openutils/?rev=3948&view=rev Author: diego_schivo Date: 2012-04-10 09:22:13 +0000 (Tue, 10 Apr 2012) Log Message: ----------- crop.tag Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 09:19:31 UTC (rev 3947) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 09:22:13 UTC (rev 3948) @@ -11,7 +11,7 @@ <jsp:directive.attribute name="jquery" required="false" rtexprvalue="true" type="java.lang.Boolean" /> <jsp:directive.attribute name="loadjs" required="false" rtexprvalue="true" type="java.lang.Boolean" /> <jsp:directive.attribute name="isEditMode" required="false" rtexprvalue="true" type="java.lang.Boolean" /> - <c:set var="isEditMode" value="${empty isEditMode ? mgnl.editMode and cmsfn:canEdit() : isEditMode}" /> + <c:set var="isEditMode" value="${empty isEditMode ? mgnl.editMode and mu:canEdit() : isEditMode}" /> <c:if test="${isEditMode}"> <c:set var="uuidBrandLink" value="uuid=${param.uuid}&" /> </c:if> @@ -47,7 +47,7 @@ </c:if> <c:choose> <c:when - test="${((mgnl.editMode and cmsfn:canEdit()) or (not empty isEditMode and isEditMode)) and param.pzcId eq pzcId}"> + test="${((mgnl.editMode and mu:canEdit()) or (not empty isEditMode and isEditMode)) and param.pzcId eq pzcId}"> <c:set var="cropScriptRequired" value="${true}" scope="request" /> <c:set var="size" value="${media:size(media:node(item), 'original')}" /> <c:if test="${empty pzcProperties}"> @@ -95,7 +95,7 @@ <c:set var="res" value="${res};pzc=${pzcProperties},quality=1" /> </c:if> <c:choose> - <c:when test="${((mgnl.editMode and cmsfn:canEdit()) or (not empty isEditMode and isEditMode))}"> + <c:when test="${((mgnl.editMode and mu:canEdit()) or (not empty isEditMode and isEditMode))}"> <div id="${pzcId}" style="overflow:hidden;width:${width}px;height:${height}px;border:0;margin:0;padding:0;position:relative"> <img src="${appCtx}${media:urlres(media:node(item), res)}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 09:19:42
|
Revision: 3947 http://openutils.svn.sourceforge.net/openutils/?rev=3947&view=rev Author: diego_schivo Date: 2012-04-10 09:19:31 +0000 (Tue, 10 Apr 2012) Log Message: ----------- mu:canEdit() Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 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 2012-04-10 09:10:22 UTC (rev 3946) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-04-10 09:19:31 UTC (rev 3947) @@ -29,12 +29,14 @@ import info.magnolia.cms.i18n.I18nContentSupportFactory; import info.magnolia.cms.i18n.I18nContentWrapper; import info.magnolia.cms.i18n.MessagesManager; +import info.magnolia.cms.security.Permission; import info.magnolia.cms.security.User; import info.magnolia.cms.security.auth.Entity; import info.magnolia.cms.util.NodeMapWrapper; import info.magnolia.context.MgnlContext; import info.magnolia.context.WebContext; import info.magnolia.jaas.principal.EntityImpl; +import info.magnolia.jcr.util.NodeUtil; import info.magnolia.link.LinkException; import info.magnolia.link.LinkUtil; import info.magnolia.repository.RepositoryConstants; @@ -983,4 +985,9 @@ } } + // magnolia-templating-compatibility-taglib-cms: info.magnolia.cms.taglibs.CmsFunctions.canEdit() + public static boolean canEdit() { + return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET); + } + } Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 2012-04-10 09:10:22 UTC (rev 3946) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 2012-04-10 09:19:31 UTC (rev 3947) @@ -338,5 +338,11 @@ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class> <function-signature>void setActivePage(info.magnolia.cms.core.Content)</function-signature> </function> + <function> + <name>canEdit</name> + <description>Check if the current user can edit the active page</description> + <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class> + <function-signature>boolean canEdit()</function-signature> + </function> <!-- please don't add new funtions without a meaningfull <description> --> </taglib> \ 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: <die...@us...> - 2012-04-10 09:10:33
|
Revision: 3946 http://openutils.svn.sourceforge.net/openutils/?rev=3946&view=rev Author: diego_schivo Date: 2012-04-10 09:10:22 +0000 (Tue, 10 Apr 2012) Log Message: ----------- cms:out, cms:setNode Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 08:58:47 UTC (rev 3945) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 09:10:22 UTC (rev 3946) @@ -1,6 +1,7 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" - xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:mu="mgnlutils"> <jsp:directive.attribute name="property" required="true" rtexprvalue="true" type="java.lang.String" /> <jsp:directive.attribute name="width" required="true" rtexprvalue="true" type="java.lang.Integer" /> <jsp:directive.attribute name="height" required="true" rtexprvalue="true" type="java.lang.Integer" /> @@ -17,7 +18,7 @@ <c:if test="${empty node}"> <c:set var="node" value="${content.handle}" /> </c:if> - <cms:setNode path="${node}" var="pzcNode" /> + <c:set value="${mu:node(node, 'website')}" var="pzcNode" /> <c:if test="${empty item}"> <c:set var="item" value="${pzcNode[property]}" /> </c:if> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 08:58:47 UTC (rev 3945) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 09:10:22 UTC (rev 3946) @@ -46,12 +46,14 @@ <c:if test="${empty property}"> <c:set var="property" value="media" /> </c:if> - <cms:out var="item" contentNode="${node}" nodeDataName="${property}" /> + <c:set var="item" value="${node[property]}" /> <c:if test="${empty width}"> - <cms:out var="width" contentNode="${node}" nodeDataName="${property}_width" /> + <c:set var="widthProperty" value="${property}_width" /> + <c:set var="width" value="${node[widthProperty]}" /> </c:if> <c:if test="${empty height}"> - <cms:out var="height" contentNode="${node}" nodeDataName="${property}_height" /> + <c:set var="heightProperty" value="${property}_height" /> + <c:set var="height" value="${node[heightProperty]}" /> </c:if> </c:if> <c:set value="${10000}" var="bigValue" /> @@ -72,7 +74,7 @@ <c:set value="${media:node(item)}" var="mediaNode" /> <c:choose> <c:when test="${!empty mediaNode}"> - <cms:setNode var="media" content="${mediaNode}" /> + <c:set var="media" value="${media:node(mediaNode)}" /> <c:choose> <c:when test="${crop and (media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview)}"> <media:crop item="${media}" width="${width}" height="${height}" property="${cropProperty}" jquery="${cropJquery}" jqueryui="${cropJqueryUI}" loadjs="${cropJs}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:58:54
|
Revision: 3945 http://openutils.svn.sourceforge.net/openutils/?rev=3945&view=rev Author: diego_schivo Date: 2012-04-10 08:58:47 +0000 (Tue, 10 Apr 2012) Log Message: ----------- cms, cmsfn Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 08:50:55 UTC (rev 3944) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 08:58:47 UTC (rev 3945) @@ -1,6 +1,6 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" - xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions"> <jsp:directive.attribute name="property" required="true" rtexprvalue="true" type="java.lang.String" /> <jsp:directive.attribute name="width" required="true" rtexprvalue="true" type="java.lang.Integer" /> <jsp:directive.attribute name="height" required="true" rtexprvalue="true" type="java.lang.Integer" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 08:50:55 UTC (rev 3944) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 08:58:47 UTC (rev 3945) @@ -1,5 +1,5 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib" + xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils"> <jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2012-04-10 08:50:55 UTC (rev 3944) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2012-04-10 08:58:47 UTC (rev 3945) @@ -1,5 +1,5 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib" + xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils"> <jsp:directive.attribute name="url" required="true" rtexprvalue="true" type="java.lang.String" Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2012-04-10 08:50:55 UTC (rev 3944) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2012-04-10 08:58:47 UTC (rev 3945) @@ -1,5 +1,5 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib" + xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils"> <jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2012-04-10 08:50:55 UTC (rev 3944) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2012-04-10 08:58:47 UTC (rev 3945) @@ -1,5 +1,5 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib" + xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils"> <jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2012-04-10 08:50:55 UTC (rev 3944) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2012-04-10 08:58:47 UTC (rev 3945) @@ -1,5 +1,5 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib" + xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils"> <jsp:directive.tag pageEncoding="UTF-8" description="Renders the flash-content and the javascript for replacing it" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:51:02
|
Revision: 3944 http://openutils.svn.sourceforge.net/openutils/?rev=3944&view=rev Author: diego_schivo Date: 2012-04-10 08:50:55 +0000 (Tue, 10 Apr 2012) Log Message: ----------- taglibs Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2012-04-10 08:45:03 UTC (rev 3943) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2012-04-10 08:50:55 UTC (rev 3944) @@ -1,6 +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:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" + xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <c:forEach var="component" items="${components}"> <cms:component content="${component}" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2012-04-10 08:45:03 UTC (rev 3943) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2012-04-10 08:50:55 UTC (rev 3944) @@ -1,6 +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:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" + xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <div class="textImage"><c:set var="mediaNode" Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2012-04-10 08:45:03 UTC (rev 3943) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2012-04-10 08:50:55 UTC (rev 3944) @@ -1,6 +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:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" + xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <div class="textImage"> <c:set var="mediaNode" value="${media:node(content.media)}" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2012-04-10 08:45:03 UTC (rev 3943) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2012-04-10 08:50:55 UTC (rev 3944) @@ -1,6 +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:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" + xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <jsp:text> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:45:12
|
Revision: 3943 http://openutils.svn.sourceforge.net/openutils/?rev=3943&view=rev Author: diego_schivo Date: 2012-04-10 08:45:03 +0000 (Tue, 10 Apr 2012) Log Message: ----------- paragraph-grid.jsp Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2012-04-10 08:41:44 UTC (rev 3942) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2012-04-10 08:45:03 UTC (rev 3943) @@ -1,8 +1,8 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" - xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" + xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> - <cms:setNode var="node" /> <table cellspacing="0" border="1"> <thead> <tr> @@ -10,7 +10,7 @@ </tr> </thead> <tbody> - <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}"> + <c:forEach var="row" items="${mu:splitAndTokenize(content.grid)}"> <tr> <td> <media:media item="${row[0]}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:41:54
|
Revision: 3942 http://openutils.svn.sourceforge.net/openutils/?rev=3942&view=rev Author: diego_schivo Date: 2012-04-10 08:41:44 +0000 (Tue, 10 Apr 2012) Log Message: ----------- mgnl:component Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2012-04-10 08:32:20 UTC (rev 3941) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2012-04-10 08:41:44 UTC (rev 3942) @@ -98,7 +98,7 @@ </sv:node> <sv:node sv:name="03"> <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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -129,13 +129,13 @@ <sv:value>2009-12-30T17:14:23.381+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-media</sv:value> + <sv:value>media:components/samples-media</sv:value> </sv:property> </sv:node> </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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -172,13 +172,13 @@ <sv:value>2010-02-18T16:42:58.906+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</sv:value> </sv:property> </sv:node> </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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -209,13 +209,13 @@ <sv:value>2010-02-18T16:43:45.406+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</sv:value> </sv:property> </sv:node> </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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -252,13 +252,13 @@ <sv:value>2010-02-18T16:47:12.125+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -295,13 +295,13 @@ <sv:value>2010-04-30T16:15:49.405+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</sv:value> </sv:property> </sv:node> </sv:node> <sv:node sv:name="04"> <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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -332,13 +332,13 @@ <sv:value>2010-05-11T16:34:25.671+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-playlist</sv:value> + <sv:value>media:components/samples-playlist</sv:value> </sv:property> </sv:node> </sv:node> <sv:node sv:name="05"> <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:multiple="true"> <sv:value>mix:lockable</sv:value> @@ -379,7 +379,7 @@ <sv:value>2010-07-06T15:50:42.687+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-media-grid</sv:value> + <sv:value>media:components/samples-media-grid</sv:value> </sv:property> </sv:node> </sv:node> @@ -483,7 +483,7 @@ <sv:value>2011-07-01T18:00:01.156+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</sv:value> </sv:property> </sv:node> </sv:node> @@ -520,7 +520,7 @@ <sv:value>2011-07-01T17:59:47.630+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</sv:value> </sv:property> </sv:node> </sv:node> @@ -628,7 +628,7 @@ <sv:value>2011-11-20T21:20:30.927+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</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: <die...@us...> - 2012-04-10 08:32:31
|
Revision: 3941 http://openutils.svn.sourceforge.net/openutils/?rev=3941&view=rev Author: diego_schivo Date: 2012-04-10 08:32:20 +0000 (Tue, 10 Apr 2012) Log Message: ----------- jsp namespaces Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2012-04-10 08:26:47 UTC (rev 3940) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2012-04-10 08:32:20 UTC (rev 3941) @@ -1,6 +1,6 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" - xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn"> + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <c:forEach var="component" items="${components}"> <cms:component content="${component}" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2012-04-10 08:26:47 UTC (rev 3940) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp 2012-04-10 08:32:20 UTC (rev 3941) @@ -1,7 +1,6 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" - xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" - xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" xmlns:cmsu="urn:jsptld:cms-util-taglib" - xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <cms:setNode var="node" /> <table cellspacing="0" border="1"> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2012-04-10 08:26:47 UTC (rev 3940) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2012-04-10 08:32:20 UTC (rev 3941) @@ -1,10 +1,6 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:cms="urn:jsptld:cms-taglib" - xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" - xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" - xmlns:cmsu="urn:jsptld:cms-util-taglib" - xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" - xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <div class="textImage"><c:set var="mediaNode" Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2012-04-10 08:26:47 UTC (rev 3940) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp 2012-04-10 08:32:20 UTC (rev 3941) @@ -1,6 +1,6 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" - xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" - xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <div class="textImage"> <c:set var="mediaNode" value="${media:node(content.media)}" /> Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2012-04-10 08:26:47 UTC (rev 3940) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp 2012-04-10 08:32:20 UTC (rev 3941) @@ -1,6 +1,6 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" - xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" - xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:mu="mgnlutils"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <div class="textImage"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:26:58
|
Revision: 3940 http://openutils.svn.sourceforge.net/openutils/?rev=3940&view=rev Author: diego_schivo Date: 2012-04-10 08:26:47 +0000 (Tue, 10 Apr 2012) Log Message: ----------- media:pages/sampleSimpleMedia Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2012-04-10 08:19:20 UTC (rev 3939) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml 2012-04-10 08:26:47 UTC (rev 3940) @@ -35,10 +35,10 @@ <sv:value>2009-01-16T09:26:04.050+01:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-07-06T15:50:42.703+02:00</sv:value> + <sv:value>2012-04-10T10:25:39.408+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>sampleSimpleMedia</sv:value> + <sv:value>media:pages/sampleSimpleMedia</sv:value> </sv:property> </sv:node> <sv:node sv:name="text_files"> @@ -414,10 +414,10 @@ <sv:value>2011-07-01T17:59:08.549+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2011-07-01T18:00:05.104+02:00</sv:value> + <sv:value>2012-04-10T10:25:45.632+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>sampleSimpleMedia</sv:value> + <sv:value>media:pages/sampleSimpleMedia</sv:value> </sv:property> </sv:node> <sv:node sv:name="main"> @@ -559,10 +559,10 @@ <sv:value>2011-07-01T17:59:08.549+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2011-11-20T21:20:30.928+01:00</sv:value> + <sv:value>2012-04-10T10:25:48.212+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>sampleSimpleMedia</sv:value> + <sv:value>media:pages/sampleSimpleMedia</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: <die...@us...> - 2012-04-10 08:19:26
|
Revision: 3939 http://openutils.svn.sourceforge.net/openutils/?rev=3939&view=rev Author: diego_schivo Date: 2012-04-10 08:19:20 +0000 (Tue, 10 Apr 2012) Log Message: ----------- area.jsp Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp (rev 0) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2012-04-10 08:19:20 UTC (rev 3939) @@ -0,0 +1,8 @@ +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn"> + <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> + <c:forEach var="component" items="${components}"> + <cms:component content="${component}" /> + </c:forEach> +</jsp:root> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:17:41
|
Revision: 3938 http://openutils.svn.sourceforge.net/openutils/?rev=3938&view=rev Author: diego_schivo Date: 2012-04-10 08:17:30 +0000 (Tue, 10 Apr 2012) Log Message: ----------- template.jsp Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2012-04-10 08:14:26 UTC (rev 3937) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2012-04-10 08:17:30 UTC (rev 3938) @@ -1,7 +1,6 @@ <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="urn:jsptld:cms-taglib" - xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" - xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"> <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"> ]]> @@ -9,19 +8,12 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>${actpage.title}</title> - <cms:links /> + <title>${content.title}</title> + <cms:init /> </head> <body> - <cms:mainBar dialog="o-page-home" /> - <h1>${actpage.title}</h1> - <div> - <cms:contentNodeIterator contentNodeCollectionName="main"> - <cms:editBar /> - <cms:includeTemplate /> - </cms:contentNodeIterator> - <cms:newBar contentNodeCollectionName="main" paragraph="samples-media,samples-mediatag,samples-playlist,samples-media-grid" /> - </div> + <h1>${content.title}</h1> + <cms:area name="main" /> </body> </html> -</jsp:root> \ No newline at end of file +</jsp:root> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 08:14:37
|
Revision: 3937 http://openutils.svn.sourceforge.net/openutils/?rev=3937&view=rev Author: diego_schivo Date: 2012-04-10 08:14:26 +0000 (Tue, 10 Apr 2012) Log Message: ----------- media sample paragraphs Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml Added 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 Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml 2012-04-10 08:07:28 UTC (rev 3936) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media-grid.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="samples-media-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>a6cfb91a-3da1-44af-b30f-4e36465569a2</sv:value> - </sv:property> - <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="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/templates/samples-media/paragraph-grid.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Grid sample for module media</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-06T15:27:17.859+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml 2012-04-10 08:07:28 UTC (rev 3936) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-media.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="samples-media" 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>18af4a49-5f3d-4d0b-948a-ce708de1aa95</sv:value> - </sv:property> - <sv:property sv:name="description" sv:type="String"> - <sv:value>Sample media paragraph for image resizing</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/templates/samples-media/paragraph-mediael.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Image resizing/crop sample</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="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>2009-09-11T14:32:42.133+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml 2012-04-10 08:07:28 UTC (rev 3936) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-mediatag.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="samples-mediatag" 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>03d80290-ec3b-4272-bf85-eb2602edf5b4</sv:value> - </sv:property> - <sv:property sv:name="description" sv:type="String"> - <sv:value>Sample media paragraph using media tag</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/templates/samples-media/paragraph-mediatag.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Insert a media (image or video) - use the media tag</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="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>2009-09-11T14:32:59.089+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml 2012-04-10 08:07:28 UTC (rev 3936) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.paragraphs.samples-playlist.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="samples-playlist" 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>8ed8a74e-bfd1-47ed-a149-936357019857</sv:value> - </sv:property> - <sv:property sv:name="description" sv:type="String"> - <sv:value>Sample playlist paragraph</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/templates/samples-media/paragraph-playlist.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Playlist sample</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="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-11T15:22:13.343+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Added: 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 (rev 0) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media-grid.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-media-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>a6cfb91a-3da1-44af-b30f-4e36465569a2</sv:value> + </sv:property> + <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="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-media/paragraph-grid.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Grid sample for module media</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>2012-04-10T10:12:27.168+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Added: 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 (rev 0) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-media.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-media" 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>18af4a49-5f3d-4d0b-948a-ce708de1aa95</sv:value> + </sv:property> + <sv:property sv:name="description" sv:type="String"> + <sv:value>Sample media paragraph for image resizing</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-media/paragraph-mediael.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Image resizing/crop sample</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>2012-04-10T10:12:01.280+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Added: 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 (rev 0) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-mediatag.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-mediatag" 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>03d80290-ec3b-4272-bf85-eb2602edf5b4</sv:value> + </sv:property> + <sv:property sv:name="description" sv:type="String"> + <sv:value>Sample media paragraph using media tag</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-media/paragraph-mediatag.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Insert a media (image or video) - use the media tag</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>2012-04-10T10:12:25.128+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Added: 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 (rev 0) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.components.samples-playlist.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-playlist" 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>8ed8a74e-bfd1-47ed-a149-936357019857</sv:value> + </sv:property> + <sv:property sv:name="description" sv:type="String"> + <sv:value>Sample playlist paragraph</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-media/paragraph-playlist.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Playlist sample</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>2012-04-10T10:12:23.119+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.pages.sampleSimpleMedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2012-04-10 08:07:28 UTC (rev 3936) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2012-04-10 08:14:26 UTC (rev 3937) @@ -160,7 +160,7 @@ <sv:value>a2749c2c-746d-4a53-b9b7-bfef92c88896</sv:value> </sv:property> <sv:property sv:name="id" sv:type="String"> - <sv:value>media:samples-media</sv:value> + <sv:value>media:components/samples-media</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> @@ -182,7 +182,7 @@ <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>2012-04-10T10:05:21.369+02:00</sv:value> + <sv:value>2012-04-10T10:11:00.864+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -197,7 +197,7 @@ <sv:value>168c261f-8667-4b09-9072-394d247abcf8</sv:value> </sv:property> <sv:property sv:name="id" sv:type="String"> - <sv:value>media:samples-mediatag</sv:value> + <sv:value>media:components/samples-mediatag</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> @@ -219,7 +219,7 @@ <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>2012-04-10T10:05:38.088+02:00</sv:value> + <sv:value>2012-04-10T10:11:06.865+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -234,7 +234,7 @@ <sv:value>027921f8-b52d-4a59-9c53-140a71b496c0</sv:value> </sv:property> <sv:property sv:name="id" sv:type="String"> - <sv:value>media:samples-playlist</sv:value> + <sv:value>media:components/samples-playlist</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> @@ -256,7 +256,7 @@ <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>2012-04-10T10:05:53.528+02:00</sv:value> + <sv:value>2012-04-10T10:11:10.495+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -271,7 +271,7 @@ <sv:value>359a80b7-4dce-40bb-b2ef-c87dfb0a32c9</sv:value> </sv:property> <sv:property sv:name="id" sv:type="String"> - <sv:value>media:samples-media-grid</sv:value> + <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> @@ -293,7 +293,7 @@ <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>2012-04-10T10:06:09.055+02:00</sv:value> + <sv:value>2012-04-10T10:11:13.334+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: <die...@us...> - 2012-04-10 08:07:39
|
Revision: 3936 http://openutils.svn.sourceforge.net/openutils/?rev=3936&view=rev Author: diego_schivo Date: 2012-04-10 08:07:28 +0000 (Tue, 10 Apr 2012) Log Message: ----------- config.modules.media.templates.pages.sampleSimpleMedia.xml Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2012-04-10 08:07:28 UTC (rev 3936) @@ -0,0 +1,303 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="sampleSimpleMedia" 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>256fa8b1-1aa3-4737-bff2-34cfcdf18712</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-media/template.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>SimpleMedia 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>2012-04-10T10:03:46.018+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>747fcad8-07a0-4169-8688-2cd2c07ba6b6</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>2012-04-10T10:03:59.878+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>70d9e27d-a70e-48e2-a011-1df5b3bdcb9e</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/templates/samples-media/area.jsp</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>list</sv:value> + </sv:property> + <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>2012-04-10T10:04:12.347+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>792ecf1f-6c26-4f94-83d7-cde453875361</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>2012-04-10T10:03:59.882+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="samples-media"> + <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>a2749c2c-746d-4a53-b9b7-bfef92c88896</sv:value> + </sv:property> + <sv:property sv:name="id" 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> + <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>2012-04-10T10:05:21.369+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-mediatag"> + <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>168c261f-8667-4b09-9072-394d247abcf8</sv:value> + </sv:property> + <sv:property sv:name="id" 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> + <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>2012-04-10T10:05:38.088+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-playlist"> + <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>027921f8-b52d-4a59-9c53-140a71b496c0</sv:value> + </sv:property> + <sv:property sv:name="id" 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> + <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>2012-04-10T10:05:53.528+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-media-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>359a80b7-4dce-40bb-b2ef-c87dfb0a32c9</sv:value> + </sv:property> + <sv:property sv:name="id" 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> + <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>2012-04-10T10:06:09.055+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml 2012-04-10 07:50:50 UTC (rev 3935) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.sampleSimpleMedia.xml 2012-04-10 08:07:28 UTC (rev 3936) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="sampleSimpleMedia" 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>256fa8b1-1aa3-4737-bff2-34cfcdf18712</sv:value> - </sv:property> - <sv:property sv:name="templatePath" sv:type="String"> - <sv:value>/templates/samples-media/template.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>SimpleMedia 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="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>2009-09-11T14:27:49.425+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. |
Revision: 3935 http://openutils.svn.sourceforge.net/openutils/?rev=3935&view=rev Author: diego_schivo Date: 2012-04-10 07:50:50 +0000 (Tue, 10 Apr 2012) Log Message: ----------- fix testGetCachedTagCloud Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2012-04-10 07:21:30 UTC (rev 3934) +++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2012-04-10 07:50:50 UTC (rev 3935) @@ -128,7 +128,7 @@ log.debug("tagCloud freq: {}", tags); assertEquals(nodesNumber, tags.get("tag2")); time = System.currentTimeMillis(); - tags = TagCloudElFunctions.cached(RepositoryConstants.WEBSITE, pathList[1], "tags", 1); + tags = TagCloudElFunctions.cached(RepositoryConstants.WEBSITE, pathList[1], "tags", 2); log.debug("Time: " + (System.currentTimeMillis() - time)); log.debug("tagCloud freq: {}", tags); assertEquals(nodesNumber, tags.get("tag1 tag4")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3934 http://openutils.svn.sourceforge.net/openutils/?rev=3934&view=rev Author: diego_schivo Date: 2012-04-10 07:21:30 +0000 (Tue, 10 Apr 2012) Log Message: ----------- useSubReaders = false Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-04-10 07:20:56 UTC (rev 3933) +++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-04-10 07:21:30 UTC (rev 3934) @@ -51,7 +51,7 @@ Collection<FacetHandler<?>> facetHandlers, WorkArea workArea) throws IOException { - super(indexReader, facetHandlers, null, workArea); + super(indexReader, facetHandlers, null, workArea, false); resolver = (HierarchyResolver) indexReader; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3933 http://openutils.svn.sourceforge.net/openutils/?rev=3933&view=rev Author: diego_schivo Date: 2012-04-10 07:20:56 +0000 (Tue, 10 Apr 2012) Log Message: ----------- BoboSubBrowser Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2012-04-10 07:18:36 UTC (rev 3932) +++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2012-04-10 07:20:56 UTC (rev 3933) @@ -50,8 +50,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Query; -import com.browseengine.bobo.api.BoboBrowser; import com.browseengine.bobo.api.BoboIndexReader; +import com.browseengine.bobo.api.BoboSubBrowser; +import com.browseengine.bobo.api.Browsable; import com.browseengine.bobo.api.BrowseException; import com.browseengine.bobo.api.BrowseFacet; import com.browseengine.bobo.api.BrowseRequest; @@ -211,7 +212,7 @@ br.setFacetSpec(propertyName, tagsSpec); - BoboBrowser browser = new BoboBrowser(boboReader); + Browsable browser = new BoboSubBrowser(boboReader); // perform browse BrowseResult result = browser.browse(br); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 07:18:47
|
Revision: 3932 http://openutils.svn.sourceforge.net/openutils/?rev=3932&view=rev Author: diego_schivo Date: 2012-04-10 07:18:36 +0000 (Tue, 10 Apr 2012) Log Message: ----------- HierarchyBoboIndexReader, TagCloudManager Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-04-10 06:31:49 UTC (rev 3931) +++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-04-10 07:18:36 UTC (rev 3932) @@ -48,10 +48,10 @@ */ protected HierarchyBoboIndexReader( IndexReader indexReader, - Collection<FacetHandler> facetHandlers, + Collection<FacetHandler<?>> facetHandlers, WorkArea workArea) throws IOException { - super(indexReader, facetHandlers, workArea); + super(indexReader, facetHandlers, null, workArea); resolver = (HierarchyResolver) indexReader; } @@ -62,7 +62,7 @@ * @return wrapped Bobo index reader instance * @throws IOException i/o exception reading indexes */ - public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers) + public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler<?>> facetHandlers) throws IOException { Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2012-04-10 06:31:49 UTC (rev 3931) +++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2012-04-10 07:18:36 UTC (rev 3932) @@ -188,7 +188,7 @@ // configure bobo for faceted search MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName); - List<FacetHandler> handlerList = Arrays.asList(new FacetHandler[]{tagsHandler }); + List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[]{tagsHandler }); BoboIndexReader boboReader = HierarchyBoboIndexReader.getInstance(ir, handlerList); // get query This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-10 06:31:56
|
Revision: 3931 http://openutils.svn.sourceforge.net/openutils/?rev=3931&view=rev Author: diego_schivo Date: 2012-04-10 06:31:49 +0000 (Tue, 10 Apr 2012) Log Message: ----------- bobo-browse 2.5.1 Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-06 15:46:15 UTC (rev 3930) +++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-10 06:31:49 UTC (rev 3931) @@ -118,9 +118,14 @@ <dependency> <groupId>com.browseengine.bobo</groupId> <artifactId>bobo-browse</artifactId> - <version>2.0.7</version> + <version>2.5.1</version> </dependency> <dependency> + <groupId>fastutil</groupId> + <artifactId>fastutil</artifactId> + <version>5.0.5</version> + </dependency> + <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltasks</artifactId> <version>5.0.0-SNAPSHOT</version> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-06 15:46:22
|
Revision: 3930 http://openutils.svn.sourceforge.net/openutils/?rev=3930&view=rev Author: diego_schivo Date: 2012-04-06 15:46:15 +0000 (Fri, 06 Apr 2012) Log Message: ----------- jackrabbit.version=2.4.1 (https://issues.apache.org/jira/browse/JCR-3236 Can not instantiate lucene Analyzer in SearchIndex) Modified Paths: -------------- magnoliamodules/trunk/magnolia-test-webapp/pom.xml magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml =================================================================== --- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-04-06 15:27:43 UTC (rev 3929) +++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2012-04-06 15:46:15 UTC (rev 3930) @@ -267,7 +267,7 @@ <properties> <magnolia.version>4.5.2</magnolia.version> <stk.version>2.0</stk.version> - <jackrabbit.version>2.4.0</jackrabbit.version> + <jackrabbit.version>2.4.1</jackrabbit.version> </properties> <build> <plugins> Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-04-06 15:27:43 UTC (rev 3929) +++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2012-04-06 15:46:15 UTC (rev 3930) @@ -185,7 +185,7 @@ </dependencies> <properties> <magnolia.version>4.5.2</magnolia.version> - <jackrabbit.version>2.4.0</jackrabbit.version> + <jackrabbit.version>2.4.1</jackrabbit.version> <jcr.version>2.0</jcr.version> </properties> <!-- test running maven with -Djcr.version=2.0 -Djackrabbit.version=2.0.0 -Djcr.version=2.0 -Djackrabbit.version=2.1.0 --> Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-06 15:27:43 UTC (rev 3929) +++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2012-04-06 15:46:15 UTC (rev 3930) @@ -172,6 +172,6 @@ </dependencies> <properties> <magnolia.version>4.5.2</magnolia.version> - <jackrabbit.version>2.4.0</jackrabbit.version> + <jackrabbit.version>2.4.1</jackrabbit.version> </properties> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-06 15:27:49
|
Revision: 3929 http://openutils.svn.sourceforge.net/openutils/?rev=3929&view=rev Author: diego_schivo Date: 2012-04-06 15:27:43 +0000 (Fri, 06 Apr 2012) Log Message: ----------- ImageUtilsTest Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2012-04-06 15:16:10 UTC (rev 3928) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2012-04-06 15:27:43 UTC (rev 3929) @@ -20,7 +20,7 @@ package net.sourceforge.openutils.mgnlmedia.media.utils; import info.magnolia.cms.core.NodeData; -import info.magnolia.cms.util.FactoryUtil; +import info.magnolia.test.ComponentsTestUtil; import java.awt.image.BufferedImage; import java.io.BufferedOutputStream; @@ -51,14 +51,7 @@ @BeforeMethod public void setup() { - FactoryUtil.setInstanceFactory(ImageProcessorsManager.class, new FactoryUtil.InstanceFactory() - { - - public Object newInstance() - { - return new ImageProcessorsManagerMock(); - } - }); + ComponentsTestUtil.setInstance(ImageProcessorsManager.class, new ImageProcessorsManagerMock()); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3928 http://openutils.svn.sourceforge.net/openutils/?rev=3928&view=rev Author: diego_schivo Date: 2012-04-06 15:16:10 +0000 (Fri, 06 Apr 2012) Log Message: ----------- AclSearchIndexTest Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2012-04-06 14:28:43 UTC (rev 3927) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2012-04-06 15:16:10 UTC (rev 3928) @@ -21,26 +21,35 @@ import info.magnolia.cms.core.HierarchyManager; import info.magnolia.cms.security.AccessManager; -import info.magnolia.cms.security.AccessManagerImpl; +import info.magnolia.cms.security.MgnlRoleManager; import info.magnolia.cms.security.Permission; import info.magnolia.cms.security.PermissionImpl; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.cms.util.SimpleUrlPattern; -import info.magnolia.context.AbstractRepositoryStrategy; +import info.magnolia.context.Context; +import info.magnolia.context.ContextDecorator; import info.magnolia.context.DefaultRepositoryStrategy; import info.magnolia.context.MgnlContext; +import info.magnolia.jcr.util.NodeUtil; +import info.magnolia.jcr.util.PropertyUtil; import info.magnolia.objectfactory.Components; import info.magnolia.repository.RepositoryConstants; import info.magnolia.repository.RepositoryManager; +import info.magnolia.test.ComponentsTestUtil; import info.magnolia.test.mock.MockWebContext; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import java.util.Map; +import javax.jcr.Node; +import javax.jcr.Session; + import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult; import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem; import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria; @@ -49,6 +58,7 @@ 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.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -58,7 +68,10 @@ * Tests that this custom search index modifies the lucene query according to ACL rules. * @author dschivo */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-acl-search-index-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-acl-search-index-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.pets.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class AclSearchIndexTest extends TestNgRepositoryTestcase { @@ -95,152 +108,205 @@ HierarchyManager hm = MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE); hm.save(); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } /** - * {@inheritDoc} + * Tests that the execution of a query on all pets returns dogs only, because of an ACL rule. + * @throws Exception */ - @SuppressWarnings("unchecked") - @Override - protected void modifyContextesToUseRealRepository() + @Test + public void testDogsOnly() throws Exception { - super.modifyContextesToUseRealRepository(); + final AccessManager wrappedAM = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE); + final AccessManager wrapperAM = new AccessManager() + { - MockWebContext mwc = (MockWebContext) MgnlContext.getInstance(); - RepositoryManager repositoryManager = Components.getComponent(RepositoryManager.class); - DefaultRepositoryStrategy drs = new DefaultRepositoryStrategy(repositoryManager, mwc); - try + public boolean isGranted(String path, long permissions) + { + // ACL rule: deny permission on pets subtree + if (StringUtils.startsWith(path, "/pets/")) + { + // ACL rule: read permission on dogs subtree + return StringUtils.startsWith(path, "/pets/dogs/"); + } + return wrappedAM.isGranted(path, permissions); + } + + public void setPermissionList(List<Permission> permissions) + { + wrappedAM.setPermissionList(permissions); + } + + public List<Permission> getPermissionList() + { + return wrappedAM.getPermissionList(); + } + + public long getPermissions(String path) + { + return wrappedAM.getPermissions(path); + } + }; + MgnlContext.setInstance(new ContextDecorator(MgnlContext.getInstance()) { - Field hmsField = AbstractRepositoryStrategy.class.getDeclaredField("hierarchyManagers"); - hmsField.setAccessible(true); - Map hms = (Map) hmsField.get(drs); - hms.put("website_website", MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE)); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - AccessManager am = new AccessManagerImpl(); + /** + * {@inheritDoc} + */ + @Override + public AccessManager getAccessManager(String name) + { + if (RepositoryConstants.WEBSITE.equals(name)) + { + return wrapperAM; + } + return super.getAccessManager(name); + } + }); try { - Field amsField = DefaultRepositoryStrategy.class.getDeclaredField("accessManagers"); - amsField.setAccessible(true); - Map ams = (Map) amsField.get(drs); - ams.put("website_website", am); + Calendar begin = Calendar.getInstance(); + begin.set(1999, Calendar.JANUARY, 1); + Calendar end = Calendar.getInstance(); + end.set(2001, Calendar.DECEMBER, 31); + + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(RepositoryConstants.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.between("@birthDate", begin, end)) + .addOrder(Order.asc("@birthDate")); + + // Query results: + // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06) + // --- 6 (title=George, petType=snake, birthDate=2000-01-20) + // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07) + // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09) + // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24) + // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07) + // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30) + // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17) + AdvancedResult result = criteria.execute(); + + // Accessible results (dogs only): + // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07) + // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24) + // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17) + ResultIterator<AdvancedResultItem> iterator = result.getItems(); + + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "4"); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "12"); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "3"); + Assert.assertFalse(iterator.hasNext()); } - catch (Exception e) + finally { - throw new RuntimeException(e); + MgnlContext.setInstance(((ContextDecorator) MgnlContext.getInstance()).getWrappedContext()); } - mwc.setRepositoryStrategy(drs); } /** - * Tests that the execution of a query on all pets returns dogs only, because of an ACL rule. + * Tests that the execution of a query on all pets does not return any dog, because of an ACL rule. * @throws Exception */ @Test - public void testDogsOnly() throws Exception + public void testDogsExcluded() throws Exception { - List<Permission> pList = new ArrayList<Permission>(); - // ACL rule: deny permission on pets subtree - Permission p; - p = new PermissionImpl(); - p.setPattern(new SimpleUrlPattern("/pets/*")); - p.setPermissions(Permission.NONE); - pList.add(p); - // ACL rule: read permission on dogs subtree - p = new PermissionImpl(); - p.setPattern(new SimpleUrlPattern("/pets/dogs/*")); - p.setPermissions(Permission.READ); - pList.add(p); - MgnlContext.getAccessManager(RepositoryConstants.WEBSITE).setPermissionList(pList); + final AccessManager wrappedAM = MgnlContext.getAccessManager(RepositoryConstants.WEBSITE); + final AccessManager wrapperAM = new AccessManager() + { - Calendar begin = Calendar.getInstance(); - begin.set(1999, Calendar.JANUARY, 1); - Calendar end = Calendar.getInstance(); - end.set(2001, Calendar.DECEMBER, 31); + public boolean isGranted(String path, long permissions) + { + // ACL rule: read permission on pets subtree + if (StringUtils.startsWith(path, "/pets/")) + { + // ACL rule: deny permission on dogs subtree + return !StringUtils.startsWith(path, "/pets/dogs/"); + } + return wrappedAM.isGranted(path, permissions); + } - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE).setBasePath( - "/pets").add(Restrictions.between("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")); + public void setPermissionList(List<Permission> permissions) + { + wrappedAM.setPermissionList(permissions); + } - // Query results: - // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06) - // --- 6 (title=George, petType=snake, birthDate=2000-01-20) - // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07) - // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09) - // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24) - // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07) - // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30) - // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17) - AdvancedResult result = criteria.execute(); + public List<Permission> getPermissionList() + { + return wrappedAM.getPermissionList(); + } - // Accessible results (dogs only): - // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07) - // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24) - // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17) - ResultIterator<AdvancedResultItem> iterator = result.getItems(); + public long getPermissions(String path) + { + return wrappedAM.getPermissions(path); + } + }; + MgnlContext.setInstance(new ContextDecorator(MgnlContext.getInstance()) + { - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "4"); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "12"); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "3"); - Assert.assertFalse(iterator.hasNext()); - } + /** + * {@inheritDoc} + */ + @Override + public AccessManager getAccessManager(String name) + { + if (RepositoryConstants.WEBSITE.equals(name)) + { + return wrapperAM; + } + return super.getAccessManager(name); + } + }); + try + { + Calendar begin = Calendar.getInstance(); + begin.set(1999, Calendar.JANUARY, 1); + Calendar end = Calendar.getInstance(); + end.set(2001, Calendar.DECEMBER, 31); - /** - * Tests that the execution of a query on all pets does not return any dog, because of an ACL rule. - * @throws Exception - */ - @Test - public void testDogsExcluded() throws Exception - { - List<Permission> pList = new ArrayList<Permission>(); - Permission p; - // ACL rule: read permission on pets subtree - p = new PermissionImpl(); - p.setPattern(new SimpleUrlPattern("/pets/*")); - p.setPermissions(Permission.READ); - pList.add(p); - // ACL rule: deny permission on dogs subtree - p = new PermissionImpl(); - p.setPattern(new SimpleUrlPattern("/pets/dogs/*")); - p.setPermissions(Permission.NONE); - pList.add(p); - MgnlContext.getAccessManager(RepositoryConstants.WEBSITE).setPermissionList(pList); + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(RepositoryConstants.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.between("@birthDate", begin, end)) + .addOrder(Order.asc("@birthDate")); - Calendar begin = Calendar.getInstance(); - begin.set(1999, Calendar.JANUARY, 1); - Calendar end = Calendar.getInstance(); - end.set(2001, Calendar.DECEMBER, 31); + AdvancedResult result = criteria.execute(); - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE).setBasePath( - "/pets").add(Restrictions.between("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")); + // Accessible results (dogs excluded): + // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06) + // --- 6 (title=George, petType=snake, birthDate=2000-01-20) + // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09) + // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07) + // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30) + ResultIterator<AdvancedResultItem> iterator = result.getItems(); - AdvancedResult result = criteria.execute(); - - // Accessible results (dogs excluded): - // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06) - // --- 6 (title=George, petType=snake, birthDate=2000-01-20) - // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09) - // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07) - // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30) - ResultIterator<AdvancedResultItem> iterator = result.getItems(); - - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "9"); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "6"); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "11"); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "1"); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(iterator.next().getName(), "5"); - Assert.assertFalse(iterator.hasNext()); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "9"); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "6"); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "11"); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "1"); + Assert.assertTrue(iterator.hasNext()); + Assert.assertEquals(iterator.next().getName(), "5"); + Assert.assertFalse(iterator.hasNext()); + } + finally + { + MgnlContext.setInstance(((ContextDecorator) MgnlContext.getInstance()).getWrappedContext()); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2012-04-06 15:14:43
|
Revision: 3926 http://openutils.svn.sourceforge.net/openutils/?rev=3926&view=rev Author: diego_schivo Date: 2012-04-06 14:28:06 +0000 (Fri, 06 Apr 2012) Log Message: ----------- criteria tests Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -19,8 +19,14 @@ package net.sourceforge.openutils.mgnlcriteria.advanced; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; @@ -47,7 +53,10 @@ * @author dschivo * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.Criteria.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.Criteria.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class BasePathTest extends TestNgRepositoryTestcase { @@ -75,6 +84,12 @@ // ----------- MagnoliaCriteriaWithLimitImpl // ------- AdvancedCriteriaImpl MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } /** Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -19,8 +19,14 @@ package net.sourceforge.openutils.mgnlcriteria.advanced; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult; @@ -40,7 +46,10 @@ * @author dschivo * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class BasePathWithSpacesTest extends TestNgRepositoryTestcase { @@ -57,6 +66,12 @@ // - Lorem ipsum dolor sit amet // --- consectetur adipisici elit MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } /** Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -21,6 +21,11 @@ import info.magnolia.cms.i18n.DefaultI18nContentSupport; import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; import info.magnolia.test.ComponentsTestUtil; @@ -48,7 +53,10 @@ * @author fgiust * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.contains.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class Content2BeanTest extends TestNgRepositoryTestcase { @@ -65,6 +73,12 @@ MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @SuppressWarnings("unchecked") Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -19,8 +19,14 @@ package net.sourceforge.openutils.mgnlcriteria.advanced; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult; @@ -40,7 +46,10 @@ * @author dschivo * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.myproject.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.myproject.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class FirstDigitEscapeTest extends TestNgRepositoryTestcase { @@ -55,6 +64,12 @@ super.setUp(); MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @Test Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -21,6 +21,11 @@ import info.magnolia.cms.i18n.DefaultI18nContentSupport; import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; import info.magnolia.test.ComponentsTestUtil; @@ -50,7 +55,10 @@ * @author dschivo * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.contains.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase { @@ -75,6 +83,12 @@ MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @Test Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -22,6 +22,11 @@ import info.magnolia.cms.core.HierarchyManager; import info.magnolia.cms.i18n.DefaultI18nContentSupport; import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; import info.magnolia.test.ComponentsTestUtil; @@ -45,7 +50,10 @@ * @author dschivo * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.contains.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase { @@ -70,6 +78,12 @@ MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @SuppressWarnings("deprecation") Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -21,6 +21,11 @@ import info.magnolia.cms.i18n.DefaultI18nContentSupport; import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; import info.magnolia.test.ComponentsTestUtil; @@ -42,7 +47,10 @@ * Tests pagination in criteria queries. * @author fnecci */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.letters.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class OrderingTest extends TestNgRepositoryTestcase { @@ -98,6 +106,12 @@ MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } /** Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -21,6 +21,11 @@ import info.magnolia.cms.i18n.DefaultI18nContentSupport; import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; import info.magnolia.test.ComponentsTestUtil; @@ -43,7 +48,10 @@ * Tests pagination in criteria queries. * @author dschivo */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.letters.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class PaginationTest extends TestNgRepositoryTestcase { @@ -69,6 +77,12 @@ MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } /** Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -20,8 +20,16 @@ package net.sourceforge.openutils.mgnlcriteria.advanced; import info.magnolia.cms.core.Content; +import info.magnolia.cms.i18n.DefaultI18nContentSupport; +import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; @@ -42,7 +50,10 @@ * @author fgiust * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.00000.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase { @@ -57,6 +68,14 @@ super.setUp(); MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @Test Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -20,8 +20,16 @@ package net.sourceforge.openutils.mgnlcriteria.advanced; import info.magnolia.cms.core.Content; +import info.magnolia.cms.i18n.DefaultI18nContentSupport; +import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; @@ -45,7 +53,10 @@ * @author lbrindisi * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.00000.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class XpathEscapeTest extends TestNgRepositoryTestcase { @@ -59,6 +70,14 @@ super.setUp(); MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @Test Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -23,8 +23,14 @@ package net.sourceforge.openutils.mgnlcriteria.advanced.impl; import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria; @@ -39,7 +45,10 @@ /** * @author carlo */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.pets.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase { @@ -72,6 +81,12 @@ // ************************************************************ // total 13 pets MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } @Test Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2012-04-06 14:28:06 UTC (rev 3926) @@ -22,9 +22,17 @@ import info.magnolia.cms.core.Content; import info.magnolia.cms.core.HierarchyManager; import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.i18n.DefaultI18nContentSupport; +import info.magnolia.cms.i18n.I18nContentSupport; +import info.magnolia.cms.security.MgnlRoleManager; +import info.magnolia.cms.security.Realm; +import info.magnolia.cms.security.SecuritySupport; +import info.magnolia.cms.security.SecuritySupportImpl; +import info.magnolia.cms.security.SystemUserManager; import info.magnolia.cms.util.NodeDataUtil; import info.magnolia.context.MgnlContext; import info.magnolia.repository.RepositoryConstants; +import info.magnolia.test.ComponentsTestUtil; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; @@ -44,7 +52,10 @@ * @author dschivo * @version $Id$ */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml") +@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { + "/crit-bootstrap/website.pets.xml", + "/crit-bootstrap/userroles.anonymous.xml", + "/crit-bootstrap/users.system.anonymous.xml" }) public class CriteriaTest extends TestNgRepositoryTestcase { @@ -79,6 +90,14 @@ // --- hamsters (title=Hamsters) // ----- 2 (title=Basil, petType=hamster, birthDate=2002-08-06) MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save(); + + ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); + + // info.magnolia.cms.security.SecurityTest.setUp() + final SecuritySupportImpl sec = new SecuritySupportImpl(); + sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); + sec.setRoleManager(new MgnlRoleManager()); + ComponentsTestUtil.setInstance(SecuritySupport.class, sec); } /** Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml 2012-04-06 14:05:47 UTC (rev 3925) +++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml 2012-04-06 14:28:06 UTC (rev 3926) @@ -32,7 +32,7 @@ <sv:value>2006-05-04T17:05:45.177+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.586+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.003+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> <sv:value/> @@ -146,7 +146,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>0393512b-b316-4573-b9a4-b695844512c6</sv:value> + <sv:value>d888a667-2b90-4040-9f9d-6f322f0664fc</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -159,7 +159,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.592+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.009+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -170,7 +170,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>b83b4e8c-c025-4f0e-a6bc-6fbcd18b36f2</sv:value> + <sv:value>df4f0cee-01c7-4869-be8d-c63b43d5cd48</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -189,7 +189,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.593+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.010+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -201,7 +201,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>93b12ff7-06fb-4cc9-a65e-ad22169ffd4f</sv:value> + <sv:value>e11cc36b-190b-41f1-badb-3fba28ddb0f1</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -220,7 +220,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.593+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.012+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -233,7 +233,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>517dd7cc-2f7e-452d-a59b-5776954cc893</sv:value> + <sv:value>85557ec5-c2f0-47e9-ab37-2b6110cd0e5d</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -246,7 +246,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.594+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.013+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -258,7 +258,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>9d84ab5d-02eb-4e50-a8f6-1d6779ba681a</sv:value> + <sv:value>705a827c-639d-41fb-8e02-1ebe02812664</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -271,7 +271,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.596+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.015+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -282,13 +282,13 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>aab8fb1b-4047-476d-b26c-8b973e56e66f</sv:value> + <sv:value>a5db2d45-7854-4a35-bae1-45fa9021bfdb</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="path" sv:type="String"> - <sv:value>/pets/dogs/*</sv:value> + <sv:value>/*</sv:value> </sv:property> <sv:property sv:name="permissions" sv:type="Long"> <sv:value>8</sv:value> @@ -301,7 +301,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.596+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.015+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -314,7 +314,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>a5216fbf-b065-459a-8919-7f58655c50cf</sv:value> + <sv:value>5823bedf-49ad-4121-81b8-e4fc86489f12</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -327,7 +327,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.598+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.017+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -339,7 +339,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>cd5e0085-3f78-4880-aac7-b17c6f157a94</sv:value> + <sv:value>3ed47dd1-c076-4962-87b6-54d7089b4e51</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -352,7 +352,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.599+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.018+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -364,7 +364,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>e8fc2d29-3104-4ef2-99b1-1db66ae5caf0</sv:value> + <sv:value>412438c8-0401-4c75-b9d1-329f862a066c</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -377,7 +377,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.600+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.019+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -389,7 +389,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>9f5e8c32-4596-4da9-8738-a541d3815fdc</sv:value> + <sv:value>e6305fc5-6b49-4b55-a2eb-cf6106bee53c</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -402,7 +402,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.602+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.021+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -413,7 +413,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>42e7bbf8-23d4-4b3f-b2f4-534b92f9c08a</sv:value> + <sv:value>babded40-2e91-4eb5-8703-c5da59c51963</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -432,7 +432,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.602+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.021+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -445,7 +445,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>b0033704-589e-46d3-b982-05d5d52bf774</sv:value> + <sv:value>1d251269-986e-4b59-942e-490c387dc322</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -458,7 +458,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.603+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.023+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -470,7 +470,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>ff411a3e-a078-43e6-947a-89b4d8232c71</sv:value> + <sv:value>8b1bbe83-1e9c-43fe-ab6d-5d3d9391c9bf</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -483,7 +483,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.605+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.024+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -495,7 +495,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>4ef3dea1-b4b6-4bc9-ad74-32f844d4e6e4</sv:value> + <sv:value>9bd3cf2c-1fe4-4dba-9459-119b9a34ec3d</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -508,7 +508,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.606+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.025+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -520,7 +520,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>7be64a8b-3846-4da2-b06d-c6f17b0c9562</sv:value> + <sv:value>85710131-1c71-4a5c-818e-9cd91b83ca56</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -533,7 +533,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.606+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.026+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -545,7 +545,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>bcdfbda0-aac4-4412-bd0f-9b0d1ce42f02</sv:value> + <sv:value>356eec7b-5418-4a09-bc79-9b059e67de31</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -558,7 +558,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.608+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.028+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -570,7 +570,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>9bbc6a68-8f6c-4469-b5d6-71ea24d62583</sv:value> + <sv:value>56364942-3db9-4ab8-99df-00ec7cad4cfa</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -583,7 +583,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.608+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.029+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -595,7 +595,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>1dc275cb-f674-40e2-a959-4cf5337ca1f8</sv:value> + <sv:value>7eaf5d7e-62a6-4301-bf59-f051394159bf</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -608,7 +608,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.609+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.030+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -620,7 +620,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>06c1f506-8864-4c89-98a7-4a3ae27042e8</sv:value> + <sv:value>14ae319a-add2-4fdf-819a-cd8e92506bcf</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -633,7 +633,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.609+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.031+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -645,7 +645,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>5b8b58e6-4e03-4ab9-b0a4-1875444767f5</sv:value> + <sv:value>60583cde-0a0e-4b74-b0bb-a31c39de8e05</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -658,7 +658,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.611+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.033+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -669,7 +669,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>293f1ae3-2341-4afa-8f5c-64271fd4a64b</sv:value> + <sv:value>54ff16e9-b523-447e-a659-9313b3a24fb9</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -688,7 +688,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.612+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.033+02:00</sv:value> </sv:property> </sv:node> </sv:node> @@ -701,7 +701,7 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>8743eb82-6ca0-4d53-a142-73141611ff22</sv:value> + <sv:value>60c6a1ef-8ab2-4365-b5d2-183def11b950</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>superuser</sv:value> @@ -714,7 +714,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2012-04-06T15:35:30.613+02:00</sv:value> + <sv:value>2012-04-06T16:06:24.034+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. |