Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4327] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-09-18 21:04:41
|
Revision: 4327
http://openutils.svn.sourceforge.net/openutils/?rev=4327&view=rev
Author: fgiust
Date: 2013-09-18 21:04:37 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
drop ContentMap, use Node for everything
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/media-samples.css
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 21:04:37 UTC (rev 4327)
@@ -39,6 +39,7 @@
import java.util.Locale;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -109,9 +110,9 @@
return null;
}
- ContentMap contentMap = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
+ Node node = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
- if (contentMap != null)
+ if (node != null)
{
Content currentpage = null;
@@ -122,11 +123,11 @@
if (currentpage == null)
{
- currentpage = new DefaultContent(contentMap.getJCRNode());
+ currentpage = new DefaultContent(node);
}
Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(contentMap.getJCRNode())),
+ new I18nContentWrapper(new DefaultContent(node)),
currentpage.getHandle());
return content;
}
@@ -531,10 +532,10 @@
return null;
}
- ContentMap playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
+ Node playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
Iterator<ContentMap> iter = Iterators.transform(
- PlaylistIterateUtils.iterate(playlistNode.getJCRNode()),
+ PlaylistIterateUtils.iterate(playlistNode),
new Function<MediaNodeAndEntryPath, ContentMap>()
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-09-18 21:04:37 UTC (rev 4327)
@@ -5,7 +5,7 @@
<jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
<jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node; if not specified, 'node' and 'property' attributes will be used"/>
- <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="the content object to use; if not specified, object 'content' will be used"/>
+ <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="java.lang.Object" description="the content object to use; if not specified, object 'content' will be used"/>
<jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
<jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
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 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-09-18 21:04:37 UTC (rev 4327)
@@ -11,10 +11,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${content.title}</title>
<cms:init />
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/media-samples.css" />
</head>
<body>
- <h1>${content.title}</h1>
- <cms:area name="main" />
+ <div class="container">
+ <h1>${content.title}</h1>
+ <cms:area name="main" />
+ </div>
</body>
</html>
-</jsp:root>
+</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css 2013-09-18 21:04:37 UTC (rev 4327)
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
