Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2013-12-08 12:51:22
|
Revision: 4465
http://openutils.svn.sourceforge.net/openutils/?rev=4465&view=rev
Author: fgiust
Date: 2013-12-08 12:51:18 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update video sample
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2013-12-08 12:25:00 UTC (rev 4464)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/media.samples.xml 2013-12-08 12:51:18 UTC (rev 4465)
@@ -38,186 +38,6 @@
<sv:value>2010-01-01T12:46:12.918Z</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="bliptv">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:media</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>ef030b33-c082-4304-abfd-65f498caedf8</sv:value>
- </sv:property>
- <sv:property sv:name="copyright" sv:type="String">
- <sv:value>openmind</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>External video sample, loaded from blip.tv</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="media_duration" sv:type="Long">
- <sv:value>71</sv:value>
- </sv:property>
- <sv:property sv:name="media_extension" sv:type="String">
- <sv:value>flv</sv:value>
- </sv:property>
- <sv:property sv:name="media_framerate" sv:type="Double">
- <sv:value>15.0</sv:value>
- </sv:property>
- <sv:property sv:name="media_height" sv:type="Long">
- <sv:value>480</sv:value>
- </sv:property>
- <sv:property sv:name="media_name" sv:type="String">
- <sv:value>Openmindonline-SimpleMediaModuleForMagnoliaCMSLoadAZipArchive567.flv</sv:value>
- </sv:property>
- <sv:property sv:name="media_width" sv:type="Double">
- <sv:value>640.0</sv:value>
- </sv:property>
- <sv:property sv:name="tags" sv:type="String">
- <sv:value>simple media, youtube</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>a sample from blip.tv</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>youtube</sv:value>
- </sv:property>
- <sv:property sv:name="videoUrl" sv:type="String">
- <sv:value>http://blip.tv/file/get/Openmindonline-SimpleMediaModuleForMagnoliaCMSLoadAZipArchive567.flv</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>true</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activatorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastaction" sv:type="Date">
- <sv:value>2010-01-01T12:46:12.918Z</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-08-25T10:06:50.109+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value/>
- </sv:property>
- </sv:node>
- <sv:node sv:name="image">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7d2f5396-9cc9-4285-abaa-66e7eff02d57</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>jpg</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>loadzip</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>240</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>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</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2009-09-09T12:31:44.774+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mimeType" sv:type="String">
- <sv:value>image/jpeg</sv:value>
- </sv:property>
- <sv:property sv:name="size" sv:type="String">
- <sv:value>14369</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>320</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="resolutions">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resolutions</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>ec963fa4-00f5-4efd-8aa2-bdbf8e609bc9</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2011-11-20T21:13:52.626+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-11-20T21:13:52.627+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="thumbnail">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:resource</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>90544e4e-942d-475b-a636-b361a138d6a5</sv:value>
- </sv:property>
- <sv:property sv:name="extension" sv:type="String">
- <sv:value>jpg</sv:value>
- </sv:property>
- <sv:property sv:name="fileName" sv:type="String">
- <sv:value>bliptv</sv:value>
- </sv:property>
- <sv:property sv:name="height" sv:type="String">
- <sv:value>75</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:data" sv:type="Binary">
- <sv:value>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</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModified" sv:type="Date">
- <sv:value>2011-11-20T21:13:52.668+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mimeType" sv:type="String">
- <sv:value>image/jpeg</sv:value>
- </sv:property>
- <sv:property sv:name="resolution" sv:type="String">
- <sv:value>thumbnail</sv:value>
- </sv:property>
- <sv:property sv:name="size" sv:type="String">
- <sv:value>2394</sv:value>
- </sv:property>
- <sv:property sv:name="width" sv:type="String">
- <sv:value>100</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
<sv:node sv:name="swiss-cow">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:media</sv:value>
@@ -1781,4 +1601,181 @@
</sv:node>
</sv:node>
</sv:node>
+ <sv:node sv:name="http---stage.orchestra.it">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:media</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>ef030b33-c082-4304-abfd-65f498caedf8</sv:value>
+ </sv:property>
+ <sv:property sv:name="copyright" sv:type="String">
+ <sv:value>openmind</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>External video sample</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_duration" sv:type="Long">
+ <sv:value>60</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_framerate" sv:type="Double">
+ <sv:value>25.0</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_height" sv:type="Long">
+ <sv:value>180</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_name" sv:type="String">
+ <sv:value>golfers.flv</sv:value>
+ </sv:property>
+ <sv:property sv:name="media_width" sv:type="Double">
+ <sv:value>320.0</sv:value>
+ </sv:property>
+ <sv:property sv:name="tags" sv:type="String">
+ <sv:value>simple media, youtube</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>a sample external flv file</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>youtube</sv:value>
+ </sv:property>
+ <sv:property sv:name="videoUrl" sv:type="String">
+ <sv:value>http://stage.orchestra.it/golfers.flv</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>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2010-01-01T12:46:12.918Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-12-08T13:50:05.065+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="image">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7d2f5396-9cc9-4285-abaa-66e7eff02d57</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>loadzip</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>240</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2009-09-09T12:31:44.774+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="size" sv:type="String">
+ <sv:value>14369</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>320</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="resolutions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resolutions</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>ec963fa4-00f5-4efd-8aa2-bdbf8e609bc9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2011-11-20T21:13:52.626+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-11-20T21:13:52.627+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="thumbnail">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:resource</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8ccabc87-ed88-4958-b9d8-e35aea235195</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>jpg</sv:value>
+ </sv:property>
+ <sv:property sv:name="fileName" sv:type="String">
+ <sv:value>http---stage.orchestra.it</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>75</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:data" sv:type="Binary">
+ <sv:value>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</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModified" sv:type="Date">
+ <sv:value>2013-12-08T13:50:05.809+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mimeType" sv:type="String">
+ <sv:value>image/jpeg</sv:value>
+ </sv:property>
+ <sv:property sv:name="resolution" sv:type="String">
+ <sv:value>thumbnail</sv:value>
+ </sv:property>
+ <sv:property sv:name="size" sv:type="String">
+ <sv:value>2394</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>100</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's larges...
[truncated message content] |
|
From: <fg...@us...> - 2013-12-08 12:25:04
|
Revision: 4464
http://openutils.svn.sourceforge.net/openutils/?rev=4464&view=rev
Author: fgiust
Date: 2013-12-08 12:25:00 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
add support for jwplayer6
Modified Paths:
--------------
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
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 2013-12-08 12:14:34 UTC (rev 4463)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2013-12-08 12:25:00 UTC (rev 4464)
@@ -30,8 +30,13 @@
description="Adds the share features to the player (only supported for jwplayer 4/5)" />
<jsp:directive.attribute name="analytics" required="false" rtexprvalue="true" type="java.lang.Boolean"
description="Track views using google analytics (only supported for jwplayer 5)" />
+ <jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String"
+ description="Player path (jwplayer5 or jwplayer6)" />
+
+ <c:set var="playerfolder" value="${player}" />
+
<c:if test="${empty requestScope['mgnlmedia_jwplayer5_link_drawn']}">
- <script type="text/javascript" src="${pageContext.request.contextPath}/.resources/media/players/jwplayer5/jwplayer.js"><!-- -->
+ <script type="text/javascript" src="${pageContext.request.contextPath}/.resources/media/players/${playerfolder}/jwplayer.js"><!-- -->
</script>
<c:set var="mgnlmedia_jwplayer5_link_drawn" scope="request" value="true" />
</c:if>
@@ -75,14 +80,14 @@
streamer: "${fn:substring(url, 0, fn:length(url) - fn:length(file))}",
]]>
</c:when>
- <c:otherwise> file:"${fn:contains(url, '://')? '' : pageContext.request.contextPath}${url}",</c:otherwise>
+ <c:otherwise> file:"${url}",</c:otherwise>
</c:choose>
<![CDATA[
modes: [
{ type: "flash",
- src: "${pageContext.request.contextPath}/.resources/media/players/jwplayer5/player.swf"
+ src: "${pageContext.request.contextPath}/.resources/media/players/${playerfolder}/player.swf"
},
{ type: "html5" },
{ type: "download" }
@@ -111,7 +116,7 @@
<![CDATA[file=${file}&streamer=${fn:substring(url, 0, fn:length(url) - fn:length(file))}]]>
</c:when>
<c:otherwise>
- <![CDATA[file=${fn:contains(url, '://')? '' : pageContext.request.contextPath}${url}]]>
+ <![CDATA[file=${url}]]>
</c:otherwise>
</c:choose>
</c:set>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-12-08 12:14:34 UTC (rev 4463)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-12-08 12:25:00 UTC (rev 4464)
@@ -76,17 +76,12 @@
</c:if>
<c:if test="${!empty(url)}">
<c:choose>
- <c:when test="${player eq 'jwplayer5' or player eq 'jwplayer'}">
+ <c:when test="${fn:contains(player, 'jwplayer')}">
<media:player-jwplayer5 url="${url}" preview="${preview}" share="${share}"
item="${item}" width="${width}" height="${height}" autoPlay="${autoPlay}" loop="${loop}" thumbnail="${thumbnail}"
- noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}" analytics="${analytics}"/>
+ noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}" analytics="${analytics}" player="${player eq 'jwplayer' ? 'jwplayer5' : player}"/>
</c:when>
<c:otherwise>
- <c:choose>
- <c:when test="${player eq 'jwplayer4'}">
- <c:set var="player" value="jwplayer4/player.swf" />
- </c:when>
- </c:choose>
<c:set var="playerPath">
<c:choose>
<c:when test="${!fn:startsWith(player, '/')}">${pageContext.request.contextPath}/.resources/media/players/${player}</c:when>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 12:14:40
|
Revision: 4463
http://openutils.svn.sourceforge.net/openutils/?rev=4463&view=rev
Author: fgiust
Date: 2013-12-08 12:14:34 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
jwplayer6
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/README.html
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.flash.swf
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.html5.js
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.js
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/README.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/README.html (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/README.html 2013-12-08 12:14:34 UTC (rev 4463)
@@ -0,0 +1,105 @@
+<!doctype html>
+<html>
+<head>
+<title>README: JW Player</title>
+<style>
+ body { padding: 50px 100px; width: 700px; font: 13px/20px Arial; background: #FFF; }
+ a, h1, h2 { color: #369; }
+ h2 { margin-top: 50px; }
+ pre { font-size: 12px; background:#E5F3C8; padding:5px 10px; border: 1px solid #D3EAA4; }
+ dt { font-weight: bold; }
+</style>
+</head><body>
+
+<h1>README: JW Player</h1>
+
+<p>Thank you for downloading JW Player 6, the world's most popular HTML5/Flash video player! See <a href="http://www.longtailvideo.com/support/jw-player/28832/about-jw-player">About JW Player</a> for an overview of supported browsers/devices, as well as a more detailed feature list. See the <a href="http://www.longtailvideo.com/support/jw-player/28835/release-notes">Release Notes</a> if you want to learn what changed with this latest release.</p>
+
+<h2>Quick Start</h2>
+
+<p>Copy the <strong>jwplayer</strong> folder that contains this README to the www root of your website. Next, include the <em>jwplayer.js</em> script in the <head> of your HTML page.</p>
+
+<p>If you have purchased the <a href="http://www.longtailvideo.com/jw-player/pricing/">Pro, Premium or Ads edition</a> of JW Player, its features can be activated by inserting your server-less JW Player license key in the second line:</p>
+
+<pre>
+<script type="text/javascript" src="/jwplayer/jwplayer.js"></script>
+<script type="text/javascript">jwplayer.key="ABCDEFGHIJKLMOPQ";</script>
+</pre>
+
+<p>Note: A key is not required to use the Free edition, but will still be available from your <a href="https://account.longtailvideo.com/">JW Player Account</a>. Including your key will enable the free <a href="http://www.longtailvideo.com/support/jw-player/28852/using-jw-player-analytics">JW Player Analytics</a> for your account.</p>
+
+<h3>Embed Code</h3>
+
+<p>When the script and key are set, scroll down to the <body> of your HTML page and insert the JW Player embed code at the place you want your video to appear:</p>
+
+<pre>
+<div id="myElement">Loading the player...</div>
+
+<script type="text/javascript">
+ jwplayer("myElement").setup({
+ file: "/uploads/myVideo.mp4",
+ image: "/uploads/myPoster.jpg"
+ });
+</script>
+</pre>
+
+<p>See <a href="http://www.longtailvideo.com/support/jw-player/28839/embedding-the-player">Embedding JW Player</a> for a more elaborate description of options and some example embeds.</p>
+
+<p><em>Note two very common issues prevent smooth video playback in Internet Explorer 9/10. First, you need to set <strong><!DOCTYPE html></strong> to prevent triggering IE's compatibility mode. Second, your videos must be served with the <strong>video/mp4</strong> mimetype. Not doing so will cause IE not to play them. See our <a href="http://www.longtailvideo.com/support/jw-player/28840/troubleshooting-your-setup">troubleshooting guide</a> for more common issues.</em></p>
+
+<h3>Premium Skins</h3>
+
+<p>If you have purchased the Premium or Ads edition of the player, your player includes a set of Premium skins. These skins can be downloaded from your <a href="https://account.longtailvideo.com/">JW Player Account</a>, but you can also load them off our CDN by simply inserting the skin name:</p>
+<pre> skin: "bekle"</pre>
+
+<p>See <a href="http://www.longtailvideo.com/support/jw-player/28846/using-jw-player-skins">Using JW Player Skins</a> for more info.</p>
+
+
+
+<h2>Documentation</h2>
+
+<p>If you need help, the LongTail Support Community contains a wealth of information, including guides on:</p>
+
+<ul>
+<li>Supported <a href="http://www.longtailvideo.com/support/jw-player/28836/media-format-support">Media Formats</a> and <a href="http://www.longtailvideo.com/support/jw-player/28837/browser-device-support">Browsers & Devices</a>.</li>
+<li> How to <a href="http://www.longtailvideo.com/support/jw-player/28839/embedding-the-player">Customize</a> and <a href="http://www.longtailvideo.com/support/jw-player/28840/troubleshooting-your-setup">Troubleshoot</a> your embeds.</li>
+<li>Configuring <a href="http://www.longtailvideo.com/support/jw-player/28842/working-with-playlists">Inline Playlists</a> or <a href="http://www.longtailvideo.com/support/jw-player/28843/loading-rss-feeds">RSS Feeds</a> (with multiple formats/qualities).</li>
+<li>The <a href="http://www.longtailvideo.com/support/jw-player/28846/using-jw-player-skins">PNG Skinning Model</a> and <a href="http://www.longtailvideo.com/support/jw-player/28850/using-the-javascript-api">JavaScript API</a>.</li>
+<li>Using <a href="http://www.longtailvideo.com/support/jw-player/28854/using-rtmp-streaming">RTMP Streaming</a> and <a href="http://www.longtailvideo.com/support/jw-player/28856/using-apple-hls-streaming/">Apple HLS</a> (Premium/Ads edition only).</li>
+<li>How to <a href="http://www.longtailvideo.com/support/jw-player/28862/configuring-video-ads">Configure Video Ads</a> (Ads edition only).</li>
+</ul>
+
+<p>Visit our <a href="http://www.longtailvideo.com/support/forums/jw-player/">Support Forums</a> for setup problems, bug reports or suggestions for new features or enhancements. The forums are very active and frequently visited by members of the JW Player development team. Please see your <a href="http://account.longtailvideo.com">JW Player Account</a> for more information on obtaining technical support.</p>
+
+<p>Follow the <a href="http://www.longtailvideo.com/blog/">LongTail Video Blog</a> for news on the JW Player and online video in general. We frequently publish posts on topics such as HTML5, video SEO, H.264, VAST advertising, etc. You can also <a href="http://twitter.com/longtailvideo">follow us on Twitter</a> or <a href="http://www.facebook.com/longtailvideo">like us on Facebook</a> to stay connected.</p>
+
+
+
+<h2>Licensing</h2>
+
+<p>Please be aware that each player edition has its own license:</p>
+
+<dl>
+<dt>JW Player Free</dt>
+<dd>Under the terms of our <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons license</a>, you can use, modify and redistribute the player for non-commercial purposes only.
+Commercial sites must <a href=" http://www.longtailvideo.com/jw-player/pricing/">purchase a license</a> for the <strong>Pro</strong>, <strong>Premium</strong> or <strong>Ads</strong> editions. See the <a href="http://www.longtailvideo.com/jw-player/license/jw-player-license-text">JW Player 6 License</a> for further details.</dd>
+<dt>JW Player Pro</dt>
+<dd>
+Under the terms of our <a href="http://www.longtailvideo.com/jw-player/license/jw-player-license-text">Commercial License</a>, you can deploy your copy of JW Player <strong>Pro</strong> for commercial use on 1 domain. See our <a href="http://www.longtailvideo.com/jw-player/pricing/">pricing page</a> for more information on edition features and pricing.
+</dd>
+<dt>JW Player Premium</dt>
+<dd>
+ Under the terms of our <a href="http://www.longtailvideo.com/jw-player/license/jw-player-license-text">Commercial License</a>, you can deploy your copy of JW Player <strong>Premium</strong> for commercial use on up to 10 domains. See our <a href="http://www.longtailvideo.com/jw-player/pricing/">pricing page</a> for more information on edition features and pricing.
+</dd>
+<dt>JW Player Ads</dt>
+<dd>
+Under the terms of our <a href="http://www.longtailvideo.com/jw-player/license/jw-player-license-text">Commercial License</a>, you can deploy your copy of JW Player <strong>Ads</strong> for commercial use on up to 10 domains, with an additional restriction of up to 250.000 filled ad impressions per month. See our <a href="http://www.longtailvideo.com/jw-player/pricing/">pricing page</a> for more information on edition features and price.</dd>
+</dl>
+
+<p>Examples of <strong>commercial use</strong> includes websites with any advertisements, websites owned or operated by businesses, websites designed to promote products or services, and tools (e.g. a CMS) that bundle JW Player in their offering.</p>
+
+<p>Note all editions of JW Player incorporate the <a href="http://www.movable-type.co.uk/scripts/tea-block.html">Block TEA library</a> from Movable Type (CC-BY license).</p>
+
+
+</body>
+</html>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/README.html
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/html
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.flash.swf
===================================================================
(Binary files differ)
Index: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.flash.swf
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.flash.swf 2013-12-08 11:58:41 UTC (rev 4462)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.flash.swf 2013-12-08 12:14:34 UTC (rev 4463)
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.flash.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.html5.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.html5.js (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/jwplayer6/jwplayer.html5.js 2013-12-08 12:14:34 UTC (rev 4463)
@@ -0,0 +1,205 @@
+(function(f){f.html5={};f.html5.version="6.7.4071"})(jwplayer);
+(function(f){var g=document;f.parseDimension=function(a){if("string"==typeof a){if(""===a)return 0;if(!(-1<a.lastIndexOf("%")))return parseInt(a.replace("px",""),10)}return a};f.timeFormat=function(a){if(0<a){var c=Math.floor(a/3600),d=Math.floor((a-3600*c)/60);a=Math.floor(a%60);return(c?c+":":"")+(10>d?"0":"")+d+":"+(10>a?"0":"")+a}return"00:00"};f.bounds=function(a){var c={left:0,right:0,width:0,height:0,top:0,bottom:0};if(!a||!g.body.contains(a))return c;if(a.getBoundingClientRect){a=a.getBoundingClientRect(a);
+var d=window.pageYOffset,b=window.pageXOffset;if(!a.width&&!a.height&&!a.left&&!a.top)return c;c.left=a.left+b;c.right=a.right+b;c.top=a.top+d;c.bottom=a.bottom+d;c.width=a.right-a.left;c.height=a.bottom-a.top}else{c.width=a.offsetWidth|0;c.height=a.offsetHeight|0;do c.left+=a.offsetLeft|0,c.top+=a.offsetTop|0;while(a=a.offsetParent);c.right=c.left+c.width;c.bottom=c.top+c.height}return c};f.empty=function(a){if(a)for(;0<a.childElementCount;)a.removeChild(a.children[0])}})(jwplayer.utils);
+(function(f){function g(){var a=document.createElement("style");a.type="text/css";document.getElementsByTagName("head")[0].appendChild(a);return a}function a(a){if(w)d[a].innerHTML=c(a);else{var b=d[a].sheet,e=m[a];if(b){var g=b.cssRules;f.exists(e)&&e<g.length&&g[e].selectorText==a?b.deleteRule(e):m[a]=g.length;b.insertRule(c(a),m[a])}}}function c(a){var b=a+"{\n";h(e[a],function(a,e){b+=" "+a+": "+e+";\n"});return b+="}\n"}var d={},b,e={},k=0,l=f.exists,h=f.foreach,m={},w=!1,n=f.css=function(c,
+j,m){if(!d[c])if(w)d[c]=g();else{if(!b||5E4<b.sheet.cssRules.length)b=g();d[c]=b}l(m)||(m=!1);e[c]||(e[c]={});h(j,function(a,b){a:{var d=b;if("undefined"===typeof d)b=void 0;else{var j=m?" !important":"";if(isNaN(d))b=d.match(/png|gif|jpe?g/i)&&0>d.indexOf("url")?"url("+d+")":d+j;else switch(a){case "z-index":case "opacity":b=d+j;break a;default:b=a.match(/color/i)?"#"+f.pad(d.toString(16).replace(/^0x/i,""),6)+j:0===d?0+j:Math.ceil(d)+"px"+j}}}l(e[c][a])&&!l(b)?delete e[c][a]:l(b)&&(e[c][a]=b)});
+0<k||a(c)};n.block=function(){k++};n.unblock=function(){k=Math.max(k-1,0);0==k&&h(d,function(b){a(b)})};f.clearCss=function(b){h(e,function(a){0<=a.indexOf(b)&&delete e[a]});h(d,function(c){0<=c.indexOf(b)&&a(c)})};f.transform=function(a,b){var c="-transform",d;b=b?b:"";"string"==typeof a?(d={},d["-webkit"+c]=b,d["-ms"+c]=b,d["-moz"+c]=b,d["-o"+c]=b,f.css(a,d)):(c="Transform",d=a.style,d["webkit"+c]=b,d["Moz"+c]=b,d["ms"+c]=b,d["O"+c]=b)};f.dragStyle=function(a,b){f.css(a,{"-webkit-user-select":b,
+"-moz-user-select":b,"-ms-user-select":b,"-webkit-user-drag":b,"user-select":b,"user-drag":b})};f.transitionStyle=function(a,b){navigator.userAgent.match(/5\.\d(\.\d)? safari/i)||f.css(a,{"-webkit-transition":b,transition:b})};f.rotate=function(a,b){f.transform(a,"rotate("+b+"deg)")};n(".jwplayer "+" div span a img ul li video".split(" ").join(",.jwplayer ")+", .jwclick",{margin:0,padding:0,border:0,color:"#000000","font-size":"100%",font:"inherit","vertical-align":"baseline","background-color":"transparent",
+"text-align":"left",direction:"ltr","-webkit-tap-highlight-color":"rgba(255, 255, 255, 0)"});n(".jwplayer ul",{"list-style":"none"})})(jwplayer.utils);
+(function(f){f.scale=function(a,c,d,b,e){var g=f.exists;g(c)||(c=1);g(d)||(d=1);g(b)||(b=0);g(e)||(e=0);f.transform(a,1==c&&1==d&&0==b&&0==e?"":"scale("+c+","+d+") translate("+b+"px,"+e+"px)")};f.stretch=function(a,c,d,b,e,k){if(c&&(a||(a=g.UNIFORM),d&&b&&e&&k)){var l=d/e,h=b/k,m="video"==c.tagName.toLowerCase(),w=!1,n;m&&f.transform(c);n="jw"+a.toLowerCase();switch(a.toLowerCase()){case g.FILL:l>h?(e*=l,k*=l):(e*=h,k*=h);case g.NONE:l=h=1;case g.EXACTFIT:w=!0;break;default:l>h?0.95<e*h/d?(w=!0,n=
+"jwexactfit"):(e*=h,k*=h):0.95<k*l/b?(w=!0,n="jwexactfit"):(e*=l,k*=l),w&&(h=Math.ceil(100*b/k)/100,l=Math.ceil(100*d/e)/100)}m?w?(c.style.width=e+"px",c.style.height=k+"px",f.scale(c,l,h,(d-e)/2/l,(b-k)/2/h)):(c.style.width="",c.style.height=""):(c.className=c.className.replace(/\s*jw(none|exactfit|uniform|fill)/g,""),c.className+=" "+n)}};var g=f.stretching={NONE:"none",FILL:"fill",UNIFORM:"uniform",EXACTFIT:"exactfit"}})(jwplayer.utils);
+(function(f){f.dfxp=function(g,a){var c,d,b=jwplayer.utils.seconds;this.load=function(b){d=b;try{c.open("GET",b,!0),c.send(null)}catch(g){a("Error loading DFXP File: "+b)}};c=new XMLHttpRequest;c.onreadystatechange=function(){if(4===c.readyState)if(200===c.status){for(var e=c.responseText,k=[{begin:0,text:""}],e=e.replace(/^\s+/,"").replace(/\s+$/,""),l=e.split("\x3c/p\x3e"),h=e.split("\x3c/tt:p\x3e"),m=[],e=0;e<l.length;e++)0<=l[e].indexOf("\x3cp")&&(l[e]=l[e].substr(l[e].indexOf("\x3cp")+2).replace(/^\s+/,
+"").replace(/\s+$/,""),m.push(l[e]));for(e=0;e<h.length;e++)0<=h[e].indexOf("\x3ctt:p")&&(h[e]=h[e].substr(h[e].indexOf("\x3ctt:p")+5).replace(/^\s+/,"").replace(/\s+$/,""),m.push(h[e]));l=m;for(e=0;e<l.length;e++){h=l[e];m={};try{var w=h.indexOf('begin\x3d"'),h=h.substr(w+7),w=h.indexOf('" end\x3d"');m.begin=b(h.substr(0,w));h=h.substr(w+7);w=h.indexOf('"');m.end=b(h.substr(0,w));w=h.indexOf('"\x3e');h=h.substr(w+2);m.text=h}catch(n){}h=m;h.text&&(k.push(h),h.end&&(k.push({begin:h.end,text:""}),
+delete h.end))}1<k.length?g(k):a("Invalid DFXP file: "+d)}else k=c.status,0==k?a("Crossdomain loading denied: "+d):404==k?a("DFXP File not found: "+d):a("Error "+k+" loading DFXP file: "+d)}}})(jwplayer.parsers);
+(function(f){f.srt=function(g,a,c){function d(b){0==b?a("Crossdomain loading denied: "+k):404==b?a("SRT File not found: "+k):a("Error "+b+" loading SRT file: "+k)}function b(b){var d=c?[]:[{begin:0,text:""}];b=l.trim(b);var e=b.split("\r\n\r\n");1==e.length&&(e=b.split("\n\n"));for(b=0;b<e.length;b++)if("WEBVTT"!=e[b]){var f,j=e[b];f={};var r=j.split("\r\n");1==r.length&&(r=j.split("\n"));try{j=1;0<r[0].indexOf(" --\x3e ")&&(j=0);var p=r[j].indexOf(" --\x3e ");0<p&&(f.begin=h(r[j].substr(0,p)),f.end=
+h(r[j].substr(p+5)));if(r[j+1]){f.text=r[j+1];for(j+=2;j<r.length;j++)f.text+="\x3cbr/\x3e"+r[j]}}catch(B){}f.text&&(d.push(f),f.end&&!c&&(d.push({begin:f.end,text:""}),delete f.end))}1<d.length?g(d):a("Invalid SRT file: "+k)}var e,k,l=jwplayer.utils,h=l.seconds;this.load=function(c){k=c;try{var g;g=c&&0<=c.indexOf("://")&&c.split("/")[2]!=window.location.href.split("/")[2]?!0:!1;g&&l.exists(window.XDomainRequest)&&(e=new XDomainRequest,e.onload=function(){b(e.responseText)},e.onerror=function(){d(e.status)});
+e.open("GET",c,!0);e.send(null)}catch(h){a("Error loading SRT File: "+c)}};e=new XMLHttpRequest;e.onreadystatechange=function(){4===e.readyState&&(200===e.status?b(e.responseText):d(e.status))}}})(jwplayer.parsers);
+(function(f){var g=jwplayer.utils,a=jwplayer.events,c=a.state,d=jwplayer.parsers,b=g.css,e="playing",k=document;f.captions=function(b,h){function m(a){g.log("CAPTIONS("+a+")")}function f(a){(F=a.fullscreen)?(n(),setTimeout(n,500)):p(!0)}function n(){var a=q.offsetHeight,b=q.offsetWidth;0!=a&&0!=b&&u.resize(b,Math.round(0.94*a))}function z(a){a=a.responseXML.firstChild;"xml"==d.localName(a)&&(a=a.nextSibling);for(;a.nodeType==a.COMMENT_NODE;)a=a.nextSibling;("tt"==d.localName(a)?new jwplayer.parsers.dfxp(r,
+m):new jwplayer.parsers.srt(r,m)).load(D)}function j(){(new jwplayer.parsers.srt(r,m)).load(D)}function r(a){u.populate(a);t<x.length&&(x[t].data=a);p(!1)}function p(a){x.length?E==e&&0<C?(u.show(),F?f({fullscreen:!0}):(B(),a&&setTimeout(B,500))):u.hide():u.hide()}function B(){u.resize()}function A(a){0<a?(t=a-1,C=a):C=0;t>=x.length||(x[t].data?u.populate(x[t].data):(D=a=x[t].file,g.ajax(a,z,j)),p(!1))}function I(){var a=[];a.push({label:"Off"});for(var b=0;b<x.length;b++)a.push({label:x[b].label});
+return a}var q,s={back:!0,color:"#FFFFFF",fontSize:15,fontFamily:"Arial,sans-serif"},y={fontStyle:"normal",fontWeight:"normal",textDecoration:"none"},u,E,t,x=[],C=0,F=!1,D,L=new a.eventdispatcher;g.extend(this,L);this.element=function(){return q};this.getCaptionsList=function(){return I()};this.getCurrentCaptions=function(){return C};this.setCurrentCaptions=function(b){if(0<=b&&C!=b&&b<=x.length){A(b);b=I();g.saveCookie("captionLabel",b[C].label);var c=a.JWPLAYER_CAPTIONS_CHANGED;L.sendEvent(c,{type:c,
+tracks:b,track:C})}};q=k.createElement("div");q.id=b.id+"_caption";q.className="jwcaptions";b.jwAddEventListener(a.JWPLAYER_PLAYER_STATE,function(a){switch(a.newstate){case c.IDLE:E="idle";p(!1);break;case c.PLAYING:E=e,p(!1)}});b.jwAddEventListener(a.JWPLAYER_PLAYLIST_ITEM,function(){t=0;x=[];u.update(0);for(var c=b.jwGetPlaylist()[b.jwGetPlaylistIndex()].tracks,d=[],e=0,j="",h=0,j="",e=0;e<c.length;e++)j=c[e].kind.toLowerCase(),("captions"==j||"subtitles"==j)&&d.push(c[e]);for(e=C=0;e<d.length;e++)if(j=
+d[e].file)d[e].label||(d[e].label=e.toString()),x.push(d[e]);for(e=0;e<x.length;e++)if(x[e]["default"]){h=e+1;break}if(j=g.getCookies().captionLabel){c=I();for(e=0;e<c.length;e++)if(j==c[e].label){h=e;break}}A(h);p(!1);c=a.JWPLAYER_CAPTIONS_LIST;d=I();L.sendEvent(c,{type:c,tracks:d,track:C})});b.jwAddEventListener(a.JWPLAYER_MEDIA_ERROR,m);b.jwAddEventListener(a.JWPLAYER_ERROR,m);b.jwAddEventListener(a.JWPLAYER_READY,function(){g.foreach(s,function(a,b){h&&void 0!=h[a.toLowerCase()]?"color"==a?y.color=
+"#"+String(h.color).substr(-6):y[a]=h[a.toLowerCase()]:y[a]=b});u=new jwplayer.html5.captions.renderer(y,q);p(!1)});b.jwAddEventListener(a.JWPLAYER_MEDIA_TIME,function(a){u.update(a.position)});b.jwAddEventListener(a.JWPLAYER_FULLSCREEN,f);b.jwAddEventListener(a.JWPLAYER_RESIZE,function(){p(!1)})};b(".jwcaptions",{position:"absolute",cursor:"pointer",width:"100%",height:"100%",overflow:"hidden"})})(jwplayer.html5);
+(function(f){var g=jwplayer.utils.foreach;f.captions.renderer=function(a,c){function d(a){k(h,{visibility:"hidden"});m.innerHTML=a;z=""==a?"hidden":"visible";setTimeout(b,20)}function b(){var b=h.clientWidth,c=Math.round(a.fontSize*Math.pow(b/400,0.6)),d=Math.round(1.4*c);k(m,{maxWidth:b+"px",fontSize:c+"px",lineHeight:d+"px",visibility:z})}function e(){for(var a=-1,b=0;b<l.length;b++)if(l[b].begin<=n&&(b==l.length-1||l[b+1].begin>=n)){a=b;break}-1==a?d(""):a!=f&&(f=a,d(l[b].text))}function k(a,b){g(b,
+function(b,c){a.style[b]=c})}var l,h,m,f,n,z="visible",j;this.hide=function(){k(h,{display:"none"});j&&(clearInterval(j),j=null)};this.populate=function(a){f=-1;l=a;e()};this.resize=function(){b()};h=document.createElement("div");m=document.createElement("span");h.appendChild(m);c.appendChild(h);k(h,{display:"block",height:"auto",position:"absolute",bottom:"20px",textAlign:"center",width:"100%"});k(m,{color:"#"+a.color.substr(-6),display:"inline-block",fontFamily:a.fontFamily,fontStyle:a.fontStyle,
+fontWeight:a.fontWeight,height:"auto",margin:"auto",position:"relative",textAlign:"center",textDecoration:a.textDecoration,wordWrap:"break-word",width:"auto"});a.back?k(m,{background:"#000"}):k(m,{textShadow:"-2px 0px 1px #000,2px 0px 1px #000,0px -2px 1px #000,0px 2px 1px #000,-1px 1px 1px #000,1px 1px 1px #000,1px -1px 1px #000,1px 1px 1px #000"});this.show=function(){k(h,{display:"block"});j||(j=setInterval(b,250));b()};this.update=function(a){n=a;l&&e()}}})(jwplayer.html5);
+(function(f){var g=f.html5,a=f.utils,c=f.events,d=c.state,b=a.css,e=a.transitionStyle,k=a.isMobile(),l=a.isAndroid(4)&&!a.isChrome(),h="button",m="text",w="slider",n="none",z="100%",j={display:n},r={display:"block"},p={display:q},B=!1,A=!0,I=null,q=void 0,s=window,y=document;g.controlbar=function(e,E){function t(a,b,c){return{name:a,type:b,className:c}}function x(b){var c=B,d;b.duration==Number.POSITIVE_INFINITY||!b.duration&&a.isSafari()&&!k?$.setText(M.jwGetPlaylist()[M.jwGetPlaylistIndex()].title||
+"Live broadcast"):(H.elapsed&&(d=a.timeFormat(b.position),H.elapsed.innerHTML=d,c=d.length!=a.timeFormat(Ja).length),H.duration&&(d=a.timeFormat(b.duration),H.duration.innerHTML=d,c=c||d.length!=a.timeFormat(ra).length),0<b.duration?(ha(b.position/b.duration),c=c||b.duration!=ra):ha(0),ra=b.duration,Ja=b.position,$.setText());c&&Fa()}function C(){var a=M.jwGetMute();P("mute",a);aa(a?0:Ta)}function F(){Ta=M.jwGetVolume()/100;aa(Ta)}function D(){b(v(".jwhd"),j);b(v(".jwcc"),j);ea();Fa()}function L(a){Ka=
+a.currentQuality;H.hd&&(H.hd.querySelector("button").className=2==ia.length&&0==Ka?"off":"");sa&&0<=Ka&&sa.setActive(a.currentQuality)}function Q(a){ja&&(La=a.track,H.cc&&(H.cc.querySelector("button").className=2==ja.length&&0==La?"off":""),ta&&0<=La&&ta.setActive(a.track))}function J(){S=a.extend({},da,U.getComponentSettings("controlbar"),E);Aa=V("background").height;b("#"+ma,{height:Aa,bottom:va?0:S.margin});b(v(".jwtext"),{font:S.fontsize+"px/"+V("background").height+"px "+S.font,color:S.fontcolor,
+"font-weight":S.fontweight});b(v(".jwoverlay"),{bottom:Aa});0<S.maxwidth&&b(v(),{"max-width":va?q:S.maxwidth})}function v(a){return"#"+ma+(a?" "+a:"")}function R(){return y.createElement("span")}function N(c,d,e,g,j){var h=R(),k=V(c);g=g?" left center":" center";var m=Y(k);h.className="jw"+c;h.innerHTML="\x26nbsp;";if(k&&""!=k.src)return e=e?{background:"url('"+k.src+"') repeat-x "+g,"background-size":m,height:j?k.height:q}:{background:"url('"+k.src+"') no-repeat"+g,"background-size":m,width:k.width,
+height:j?k.height:q},h.skin=k,b(v((j?".jwvertical ":"")+".jw"+c),a.extend(e,d)),H[c]=h}function O(a,c,d,e){c&&c.src&&(b(a,{width:c.width,background:"url("+c.src+") no-repeat center","background-size":Y(c)}),d.src&&!k&&b(a+":hover,"+a+".off:hover",{background:"url("+d.src+") no-repeat center","background-size":Y(d)}),e&&e.src&&b(a+".off",{background:"url("+e.src+") no-repeat center","background-size":Y(e)}))}function X(a){return function(b){pb[a]&&(pb[a](),k&&Ma.sendEvent(c.JWPLAYER_USER_ACTION));
+b.preventDefault&&b.preventDefault()}}function ba(b){a.foreach(Wa,function(a,c){a!=b&&("cc"==a&&(clearTimeout(Ba),Ba=q),"hd"==a&&(clearTimeout(Ca),Ca=q),c.hide())})}function Z(){va||(na.show(),ba("volume"))}function P(b,c){a.exists(c)||(c=!Xa[b]);H[b]&&(H[b].className="jw"+b+(c?" jwtoggle jwtoggling":" jwtoggling"),setTimeout(function(){H[b].className=H[b].className.replace(" jwtoggling","")},100));Xa[b]=c}function Y(a){return a?parseInt(a.width)+"px "+parseInt(a.height)+"px":"0 0"}function ka(){ia&&
+2<ia.length&&(db&&(clearTimeout(db),db=q),sa.show(),ba("hd"))}function fa(){ja&&2<ja.length&&(eb&&(clearTimeout(eb),eb=q),ta.show(),ba("cc"))}function ga(a){0<=a&&a<ia.length&&(M.jwSetCurrentQuality(a),clearTimeout(Ca),Ca=q,sa.hide())}function la(a){0<=a&&a<ja.length&&(M.jwSetCurrentCaptions(a),clearTimeout(Ba),Ba=q,ta.hide())}function fb(){2==ja.length&&la((La+1)%2)}function gb(){2==ia.length&&ga((Ka+1)%2)}function Ga(a){a.preventDefault();y.onselectstart=function(){return B}}function nb(){H.timeRail.className=
+"jwrail";M.jwGetState()!=d.IDLE&&(M.jwSeekDrag(A),oa="time",Na(),Ma.sendEvent(c.JWPLAYER_USER_ACTION))}function Ya(b){if(oa){var d=(new Date).getTime();50<d-hb&&(G(b),hb=d);var e=H[oa].getElementsByClassName("jwrail")[0],e=a.bounds(e),e=b.x/e.width;100<e&&(e=100);b.type==a.touchEvents.DRAG_END?(M.jwSeekDrag(B),H.timeRail.className="jwrail jwsmooth",oa=I,Za.time(e),W()):(ha(e),500<d-ib&&(ib=d,Za.time(e)));Ma.sendEvent(c.JWPLAYER_USER_ACTION)}}function wa(b){var e=H.time.getElementsByClassName("jwrail")[0],
+e=a.bounds(e);b=b.x/e.width;100<b&&(b=100);M.jwGetState()!=d.IDLE&&(Za.time(b),Ma.sendEvent(c.JWPLAYER_USER_ACTION))}function jb(a){return function(b){0==b.button&&(H[a+"Rail"].className="jwrail","time"==a?M.jwGetState()!=d.IDLE&&(M.jwSeekDrag(A),oa=a):oa=a)}}function Oa(b){var c=(new Date).getTime();50<c-hb&&(G(b),hb=c);if(oa&&0==b.button){var d=H[oa].getElementsByClassName("jwrail")[0],e=a.bounds(d),d=oa,e=H[d].vertical?(e.bottom-b.pageY)/e.height:(b.pageX-e.left)/e.width;"mouseup"==b.type?("time"==
+d&&M.jwSeekDrag(B),H[d+"Rail"].className="jwrail jwsmooth",oa=I,Za[d.replace("H","")](e)):("time"==oa?ha(e):aa(e),500<c-ib&&(ib=c,Za[oa.replace("H","")](e)));return!1}}function Na(){pa&&(ra&&!va&&!k)&&(xa(pa),pa.show())}function W(){pa&&pa.hide()}function G(b){if((Ha=a.bounds(kb))&&0!=Ha.width){var c=pa.element();b=b.pageX?b.pageX-Ha.left-s.pageXOffset:b.x;0<=b&&b<=Ha.width&&(c.style.left=Math.round(b)+"px",T(ra*b/Ha.width),ua=a.bounds(K))}}function T(b){lb.innerHTML=Ua?Ua.text:a.timeFormat(b);$a.updateTimeline(b);
+pa.setContents(ab);ua=a.bounds(K);xa(pa)}function za(){a.foreach(bb,function(a,b){b.element.style.left=100*b.position/ra+"%"})}function ya(){eb=setTimeout(ta.hide,500)}function mb(){db=setTimeout(sa.hide,500)}function Pa(a,c,e,d){if(!k){var g=a.element();c.appendChild(g);c.addEventListener("mousemove",e,B);d?c.addEventListener("mouseout",d,B):c.addEventListener("mouseout",a.hide,B);b("#"+g.id,{left:"50%"})}}function qa(d,e,g,j){if(k){var h=d.element();e.appendChild(h);(new a.touch(e)).addEventListener(a.touchEvents.TAP,
+function(){var a=g;"cc"==j?(2==ja.length&&(a=fb),Ba?(clearTimeout(Ba),Ba=q,d.hide()):(Ba=setTimeout(function(){d.hide();Ba=q},4E3),a()),Ma.sendEvent(c.JWPLAYER_USER_ACTION)):"hd"==j&&(2==ia.length&&(a=gb),Ca?(clearTimeout(Ca),Ca=q,d.hide()):(Ca=setTimeout(function(){d.hide();Ca=q},4E3),a()),Ma.sendEvent(c.JWPLAYER_USER_ACTION))});b("#"+h.id,{left:"50%"})}}function Qa(c){var d=R();d.className="jwgroup jw"+c;Ra[c]=d;if(Ia[c]){var d=Ia[c],e=Ra[c];if(d&&0<d.elements.length)for(var u=0;u<d.elements.length;u++){var f;
+a:{f=d.elements[u];var D=c;switch(f.type){case m:D=void 0;f=f.name;var D={},p=V(("alt"==f?"elapsed":f)+"Background");if(p.src){var r=R();r.id=ma+"_"+f;r.className="elapsed"==f||"duration"==f?"jwtext jw"+f+" jwhidden":"jwtext jw"+f;D.background="url("+p.src+") repeat-x center";D["background-size"]=Y(V("background"));b(v(".jw"+f),D);"alt"!=f?r.innerHTML="00:00":r.innerHTML="";D=H[f]=r}else D=null;f=D;break a;case h:if("blank"!=f.name){f=f.name;p=D;if(!V(f+"Button").src||k&&("mute"==f||0==f.indexOf("volume"))||
+l&&/hd|cc/.test(f))f=I;else{var D=R(),r=R(),s=void 0,s=ca,t=N(s.name);t||(t=R(),t.className="jwblankDivider");s.className&&(t.className+=" "+s.className);s=t;t=y.createElement("button");D.style+=" display:inline-block";D.className="jw"+f+" jwbuttoncontainer";"left"==p?(D.appendChild(r),D.appendChild(s)):(D.appendChild(s),D.appendChild(r));k?"hd"!=f&&"cc"!=f&&(new a.touch(t)).addEventListener(a.touchEvents.TAP,X(f)):t.addEventListener("click",X(f),B);t.innerHTML="\x26nbsp;";r.appendChild(t);p=V(f+
+"Button");r=V(f+"ButtonOver");s=V(f+"ButtonOff");O(v(".jw"+f+" button"),p,r,s);(p=vb[f])&&O(v(".jw"+f+".jwtoggle button"),V(p+"Button"),V(p+"ButtonOver"));f=H[f]=D}break a}break;case w:D=void 0;s=f.name;if(k&&0==s.indexOf("volume"))D=void 0;else{f=R();var r="volume"==s,E=s+("time"==s?"Slider":"")+"Cap",p=r?"Top":"Left",D=r?"Bottom":"Right",t=N(E+p,I,B,B,r),Q=N(E+D,I,B,B,r),x;x=s;var J=r,la=p,A=D,C=R(),L=["Rail","Buffer","Progress"],F=void 0;C.className="jwrail jwsmooth";for(var ga=0;ga<L.length;ga++){var ka=
+"time"==x?"Slider":"",G=x+ka+L[ga],K=N(G,I,!J,0==x.indexOf("volume"),J),M=N(G+"Cap"+la,I,B,B,J),ba=N(G+"Cap"+A,I,B,B,J),Z=V(G+"Cap"+la),P=V(G+"Cap"+A);if(K){var S=R();S.className="jwrailgroup "+L[ga];M&&S.appendChild(M);S.appendChild(K);ba&&(S.appendChild(ba),ba.className+=" jwcap"+(J?"Bottom":"Right"));b(v(".jwrailgroup."+L[ga]),{"min-width":J?q:Z.width+P.width});S.capSize=J?Z.height+P.height:Z.width+P.width;b(v("."+K.className),{left:J?q:Z.width,right:J?q:P.width,top:J?Z.height:q,bottom:J?P.height:
+q,height:J?"auto":q});2==ga&&(F=S);2==ga&&!J?(K=R(),K.className="jwprogressOverflow",K.appendChild(S),H[G]=K,C.appendChild(K)):(H[G]=S,C.appendChild(S))}}if(la=N(x+ka+"Thumb",I,B,B,J))b(v("."+la.className),{opacity:"time"==x?0:1,"margin-top":J?la.skin.height/-2:q}),la.className+=" jwthumb",(J&&F?F:C).appendChild(la);k?(J=new a.touch(C),J.addEventListener(a.touchEvents.DRAG_START,nb),J.addEventListener(a.touchEvents.DRAG,Ya),J.addEventListener(a.touchEvents.DRAG_END,Ya),J.addEventListener(a.touchEvents.TAP,
+wa)):(F=x,"volume"==F&&!J&&(F+="H"),C.addEventListener("mousedown",jb(F),B));"time"==x&&!k&&(C.addEventListener("mousemove",Na,B),C.addEventListener("mouseout",W,B));x=H[x+"Rail"]=C;C=V(E+p);E=V(E+p);V(s+"SliderRail");f.className="jwslider jw"+s;t&&f.appendChild(t);f.appendChild(x);Q&&(r&&(Q.className+=" jwcapBottom"),f.appendChild(Q));b(v(".jw"+s+" .jwrail"),{left:r?q:C.width,right:r?q:E.width,top:r?C.height:q,bottom:r?E.height:q,width:r?z:q,height:r?"auto":q});H[s]=f;f.vertical=r;"time"==s?(pa=
+new g.overlay(ma+"_timetooltip",U),$a=new g.thumbs(ma+"_thumb"),lb=y.createElement("div"),lb.className="jwoverlaytext",ab=y.createElement("div"),D=$a.element(),ab.appendChild(D),ab.appendChild(lb),pa.setContents(ab),kb=x,T(0),D=pa.element(),x.appendChild(D),H.timeSliderRail||b(v(".jwtime"),j),H.timeSliderThumb&&b(v(".jwtimeSliderThumb"),{"margin-left":V("timeSliderThumb").width/-2}),D=V("timeSliderCue"),p={"z-index":1},D&&D.src?N("timeSliderCue"):p.display=n,b(v(".jwtimeSliderCue"),p),Sa(0),ha(0),
+ha(0),Sa(0)):0==s.indexOf("volume")&&(s=f,t="volume"+(r?"":"H"),Q=r?"vertical":"horizontal",b(v(".jw"+t+".jw"+Q),{width:V(t+"Rail",r).width+(r?0:V(t+"Cap"+p).width+V(t+"RailCap"+p).width+V(t+"RailCap"+D).width+V(t+"Cap"+D).width),height:r?V(t+"Cap"+p).height+V(t+"Rail").height+V(t+"RailCap"+p).height+V(t+"RailCap"+D).height+V(t+"Cap"+D).height:q}),s.className+=" jw"+Q);D=f}f=D;break a}f=void 0}f&&("volume"==d.elements[u].name&&f.vertical?(na=new g.overlay(ma+"_volumeOverlay",U),na.setContents(f)):
+e.appendChild(f))}}}function ea(){1<M.jwGetPlaylist().length&&(!y.querySelector("#"+M.id+" .jwplaylist")||M.jwGetFullscreen())?(b(v(".jwnext"),p),b(v(".jwprev"),p)):(b(v(".jwnext"),j),b(v(".jwprev"),j))}function xa(b){ua||(ua=a.bounds(K));b.offsetX(0);var c=a.bounds(b.element());c.right>ua.right?b.offsetX(ua.right-c.right):c.left<ua.left&&b.offsetX(ua.left-c.left)}function Sa(a){a=Math.min(Math.max(0,a),1);H.timeSliderBuffer&&(H.timeSliderBuffer.style.width=100*a+"%",H.timeSliderBuffer.style.opacity=
+0<a?1:0)}function Da(a,b){if(H[a]){var c=H[a].vertical,d=a+("time"==a?"Slider":""),e=100*Math.min(Math.max(0,b),1)+"%",g=H[d+"Progress"],d=H[d+"Thumb"];g&&(c?(g.style.height=e,g.style.bottom=0):g.style.width=e,g.style.opacity=0<b||oa?1:0);d&&(c?d.style.top=0:d.style.left=e)}}function aa(a){Da("volume",a);Da("volumeH",a)}function ha(a){Da("time",a)}function V(a){var b="controlbar",c=a;0==a.indexOf("volume")&&(0==a.indexOf("volumeH")?c=a.replace("volumeH","volume"):b="tooltip");return(a=U.getSkinElement(b,
+c))?a:{width:0,height:0,src:"",image:q,ready:B}}function cb(b){if("array"==!a.typeOf(b))return Ea("Invalid data");a.foreach(b,function(a,b){var c=b.begin,d=b.text;if(0<=c){var e=N("timeSliderCue"),g=K.querySelector(".jwtimeSliderRail"),j={position:c,text:d,element:e};e&&g&&(g.appendChild(e),e.addEventListener("mouseover",function(){Ua=j},!1),e.addEventListener("mouseout",function(){Ua=I},!1));bb.push(j)}za()})}function Ea(b){a.log("Cues failed to load: "+b)}var M,U,ca=t("divider","divider"),da={margin:8,
+maxwidth:800,font:"Arial,sans-serif",fontsize:11,fontcolor:15658734,fontweight:"bold",layout:{left:{position:"left",elements:[t("play",h),t("prev",h),t("next",h),t("elapsed",m)]},center:{position:"center",elements:[t("time",w),t("alt",m)]},right:{position:"right",elements:[t("duration",m),t("hd",h),t("cc",h),t("mute",h),t("volume",w),t("volumeH",w),t("fullscreen",h)]}}},S,Ia,H,Aa,K,ma,ra,Ja,ia,Ka,ja,La,Ta,na,ua,kb,Ha,pa,ab,$a,lb,db,Ca,sa,eb,Ba,ta,qb,Va,va=B,ob=B,oa=B,ib=0,rb=-1,hb=0,bb=[],Ua,Ma=new c.eventdispatcher,
+vb={play:"pause",mute:"unmute",fullscreen:"normalscreen"},Xa={play:B,mute:B,fullscreen:B},pb={play:function(){Xa.play?M.jwPause():M.jwPlay()},mute:function(){M.jwSetMute(!Xa.mute);C({mute:Xa.mute})},fullscreen:function(){M.jwSetFullscreen()},next:function(){M.jwPlaylistNext()},prev:function(){M.jwPlaylistPrev()},hd:gb,cc:fb},Za={time:function(a){M.jwSeek(Ua?Ua.position:a*ra)},volume:function(a){aa(a);0.1>a&&(a=0);0.9<a&&(a=1);M.jwSetVolume(100*a)}},Wa={},$=this;a.extend($,Ma);$.setText=function(a){b(v(".jwelapsed"),
+a?j:r);b(v(".jwduration"),a?j:r);b(v(".jwtime"),a?j:r);b(v(".jwalt"),a?r:j);H.timeSliderRail||b(v(".jwtime"),j);var c=K.querySelector(".jwalt");c&&(c.innerHTML=a||"");Fa()};var Ra={},Fa=function(){clearTimeout(qb);qb=setTimeout($.redraw,0)};$.redraw=function(c){c&&$.visible&&$.show(A);J();c=V("capLeft");var d=V("capRight");b(v(".jwgroup.jwcenter"),{left:Math.round(a.parseDimension(Ra.left.offsetWidth)+c.width),right:Math.round(a.parseDimension(Ra.right.offsetWidth)+d.width)});c=!va&&K.parentNode.clientWidth>
+S.maxwidth;d=va?0:S.margin;b(v(),{left:c?"50%":d,right:c?q:d,"margin-left":c?K.clientWidth/-2:q,width:c?z:q});c=top!==self&&a.isIE();b(v(".jwfullscreen"),{display:va||ob||c?n:q});b(v(".jwvolumeH"),{display:va?"block":n});b(v(".jwhd"),{display:!va&&ia&&1<ia.length&&sa?q:n});b(v(".jwcc"),{display:!va&&ja&&1<ja.length&&ta?q:n});ua=a.bounds(K);a.foreach(Wa,function(a,b){xa(b)});za()};$.audioMode=function(a){a!=va&&(va=a,Fa())};$.hideFullscreen=function(a){a!=ob&&(ob=a,Fa())};$.element=function(){return K};
+$.margin=function(){return parseInt(S.margin)};$.height=function(){return Aa};$.show=function(c){if(!$.visible||c)clearTimeout(Va),Va=q,$.visible=!0,K.style.display="inline-block",Fa(),C(),K&&K.querySelector(".jwalt")&&(320<=a.bounds(K.parentNode).width&&!K.querySelector(".jwalt").innerHTML?b(v(".jwhidden"),p):b(v(".jwhidden"),j)),Va=setTimeout(function(){K.style.opacity=1},10)};$.showTemp=function(){this.visible||(K.style.opacity=0,K.style.display="inline-block")};$.hideTemp=function(){this.visible||
+(K.style.display=n)};$.hide=function(){$.visible&&($.visible=!1,K.style.opacity=0,clearTimeout(Va),Va=q,Va=setTimeout(function(){K.style.display=n},250))};H={};M=e;ma=M.id+"_controlbar";ra=Ja=0;K=R();K.id=ma;K.className="jwcontrolbar";U=M.skin;var wb=setInterval(function(){var b=y.getElementById(ma),c=a.bounds(b).width;b!=K?clearInterval(wb):0<c&&($.visible&&c!=rb)&&(rb=c,$.show(A))},200);Ia=U.getComponentLayout("controlbar");Ia||(Ia=da.layout);a.clearCss("#"+ma);J();var sb=N("capLeft"),tb=N("capRight"),
+ub=N("background",{position:"absolute",left:V("capLeft").width,right:V("capRight").width,"background-repeat":"repeat-x"},A);ub&&K.appendChild(ub);sb&&K.appendChild(sb);Qa("left");Qa("center");Qa("right");K.appendChild(Ra.left);K.appendChild(Ra.center);K.appendChild(Ra.right);H.hd&&(sa=new g.menu("hd",ma+"_hd",U,ga),k?qa(sa,H.hd,ka,"hd"):Pa(sa,H.hd,ka,mb),Wa.hd=sa);H.cc&&(ta=new g.menu("cc",ma+"_cc",U,la),k?qa(ta,H.cc,fa,"cc"):Pa(ta,H.cc,fa,ya),Wa.cc=ta);H.mute&&(H.volume&&H.volume.vertical)&&(na=
+new g.overlay(ma+"_volumeoverlay",U),na.setContents(H.volume),Pa(na,H.mute,Z),Wa.volume=na);b(v(".jwright"),{right:V("capRight").width});tb&&K.appendChild(tb);M.jwAddEventListener(c.JWPLAYER_MEDIA_TIME,x);M.jwAddEventListener(c.JWPLAYER_PLAYER_STATE,function(a){switch(a.newstate){case d.BUFFERING:case d.PLAYING:b(v(".jwtimeSliderThumb"),{opacity:1});P("play",A);break;case d.PAUSED:oa||P("play",B);break;case d.IDLE:P("play",B),b(v(".jwtimeSliderThumb"),{opacity:0}),H.timeRail&&(H.timeRail.className=
+"jwrail",setTimeout(function(){H.timeRail.className+=" jwsmooth"},100)),Sa(0),x({position:0,duration:0})}});M.jwAddEventListener(c.JWPLAYER_PLAYLIST_ITEM,function(b){b=M.jwGetPlaylist()[b.index].tracks;var c=B,d=K.querySelector(".jwtimeSliderRail");a.foreach(bb,function(a,b){d.removeChild(b.element)});bb=[];if("array"==a.typeOf(b)&&!k)for(var e=0;e<b.length;e++)if(!c&&(b[e].file&&b[e].kind&&"thumbnails"==b[e].kind.toLowerCase())&&($a.load(b[e].file),c=A),b[e].file&&b[e].kind&&"chapters"==b[e].kind.toLowerCase()){var g=
+b[e].file;g?(new f.parsers.srt(cb,Ea,!0)).load(g):bb=[]}c||$a.load()});M.jwAddEventListener(c.JWPLAYER_MEDIA_MUTE,C);M.jwAddEventListener(c.JWPLAYER_MEDIA_VOLUME,F);M.jwAddEventListener(c.JWPLAYER_MEDIA_BUFFER,function(a){Sa(a.bufferPercent/100)});M.jwAddEventListener(c.JWPLAYER_FULLSCREEN,function(a){P("fullscreen",a.fullscreen);ea()});M.jwAddEventListener(c.JWPLAYER_PLAYLIST_LOADED,D);M.jwAddEventListener(c.JWPLAYER_MEDIA_LEVELS,function(a){if((ia=a.levels)&&1<ia.length&&sa){b(v(".jwhd"),p);sa.clearOptions();
+for(var c=0;c<ia.length;c++)sa.addOption(ia[c].label,c);L(a)}else b(v(".jwhd"),j);Fa()});M.jwAddEventListener(c.JWPLAYER_MEDIA_LEVEL_CHANGED,L);M.jwAddEventListener(c.JWPLAYER_CAPTIONS_LIST,function(a){if((ja=a.tracks)&&1<ja.length&&ta){b(v(".jwcc"),p);ta.clearOptions();for(var c=0;c<ja.length;c++)ta.addOption(ja[c].label,c);Q(a)}else b(v(".jwcc"),j);Fa()});M.jwAddEventListener(c.JWPLAYER_CAPTIONS_CHANGED,Q);k||(K.addEventListener("mouseover",function(){s.addEventListener("mousemove",Oa,B);s.addEventListener("mouseup",
+Oa,B);s.addEventListener("mousedown",Ga,B)},!1),K.addEventListener("mouseout",function(){s.removeEventListener("mousemove",Oa);s.removeEventListener("mouseup",Oa);s.removeEventListener("mousedown",Ga);y.onselectstart=null},!1));setTimeout(function(){F();C()},0);D();$.visible=!1};b(".jwcontrolbar",{position:"absolute",opacity:0,display:n});b(".jwcontrolbar span",{height:z});a.dragStyle(".jwcontrolbar span",n);b(".jwcontrolbar .jwgroup",{display:"inline"});b(".jwcontrolbar span, .jwcontrolbar .jwgroup button,.jwcontrolbar .jwleft",
+{position:"relative","float":"left"});b(".jwcontrolbar .jwright",{position:"absolute"});b(".jwcontrolbar .jwcenter",{position:"absolute"});b(".jwcontrolbar buttoncontainer,.jwcontrolbar button",{display:"inline-block",height:z,border:n,cursor:"pointer"});b(".jwcontrolbar .jwcapRight,.jwcontrolbar .jwtimeSliderCapRight,.jwcontrolbar .jwvolumeCapRight",{right:0,position:"absolute"});b(".jwcontrolbar .jwcapBottom",{bottom:0,position:"absolute"});b(".jwcontrolbar .jwtime",{position:"absolute",height:z,
+width:z,left:0});b(".jwcontrolbar .jwthumb",{position:"absolute",height:z,cursor:"pointer"});b(".jwcontrolbar .jwrail",{position:"absolute",cursor:"pointer"});b(".jwcontrolbar .jwrailgroup",{position:"absolute",width:z});b(".jwcontrolbar .jwrailgroup span",{position:"absolute"});b(".jwcontrolbar .jwdivider+.jwdivider",{display:n});b(".jwcontrolbar .jwtext",{padding:"0 5px","text-align":"center"});b(".jwcontrolbar .jwalt",{display:n,overflow:"hidden"});b(".jwcontrolbar .jwalt",{position:"absolute",
+left:0,right:0,"text-align":"left"},A);b(".jwcontrolbar .jwoverlaytext",{padding:3,"text-align":"center"});b(".jwcontrolbar .jwvertical *",{display:"block"});b(".jwcontrolbar .jwvertical .jwvolumeProgress",{height:"auto"},A);b(".jwcontrolbar .jwprogressOverflow",{position:"absolute",overflow:"hidden"});b(".jwcontrolbar .jwduration .jwhidden",{});e(".jwcontrolbar","opacity .25s, background .25s, visibility .25s");e(".jwcontrolbar button","opacity .25s, background .25s, visibility .25s");e(".jwcontrolbar .jwtime .jwsmooth span",
+"opacity .25s, background .25s, visibility .25s, width .25s linear, left .05s linear");e(".jwcontrolbar .jwtoggling",n)})(jwplayer);
+(function(f){var g=f.utils,a=f.events,c=a.state,d=f.playlist,b=!0,e=!1;f.html5.controller=function(k,l){function h(){return k.getVideo()}function m(a){s.sendEvent(a.type,a)}function w(c){z(b);switch(g.typeOf(c)){case "string":var e=new d.loader;e.addEventListener(a.JWPLAYER_PLAYLIST_LOADED,function(a){w(a.playlist)});e.addEventListener(a.JWPLAYER_ERROR,function(a){w([]);a.message="Could not load playlist: "+a.message;m(a)});e.load(c);break;case "object":case "array":q.setPlaylist(new f.playlist(c));
+break;case "number":q.setItem(c)}}function n(d){g.exists(d)||(d=b);if(!d)return j();try{0<=u&&(w(u),u=-1);if(!E&&(E=b,s.sendEvent(a.JWPLAYER_MEDIA_BEFOREPLAY),E=e,C)){C=e;t=null;return}if(q.state==c.IDLE){if(0==q.playlist.length)return e;h().load(q.playlist[q.item])}else q.state==c.PAUSED&&h().play();return b}catch(f){s.sendEvent(a.JWPLAYER_ERROR,f),t=null}return e}function z(d){t=null;try{return q.state!=c.IDLE?h().stop():d||(x=b),E&&(C=b),b}catch(g){s.sendEvent(a.JWPLAYER_ERROR,g)}return e}function j(d){t=
+null;g.exists(d)||(d=b);if(!d)return n();try{switch(q.state){case c.PLAYING:case c.BUFFERING:h().pause();break;default:E&&(C=b)}return b}catch(j){s.sendEvent(a.JWPLAYER_ERROR,j)}return e}function r(a){w(a);n()}function p(){r(q.item+1)}function B(){q.state==c.IDLE&&(x?x=e:(t=B,q.repeat?p():q.item==q.playlist.length-1?(u=0,z(b),setTimeout(function(){s.sendEvent(a.JWPLAYER_PLAYLIST_COMPLETE)},0)):p()))}function A(a){return function(){y?I(a,arguments):F.push({method:a,arguments:arguments})}}function I(a,
+b){var c=[],d;for(d=0;d<b.length;d++)c.push(b[d]);a.apply(this,c)}var q=k,s=new a.eventdispatcher(q.id,q.config.debug),y=e,u=-1,E,t,x=e,C,F=[];g.extend(this,s);this.play=A(n);this.pause=A(j);this.seek=A(function(a){q.state!=c.PLAYING&&n(b);h().seek(a)});this.stop=function(){x=b;A(z)()};this.load=A(w);this.next=A(p);this.prev=A(function(){r(q.item-1)});this.item=A(r);this.setVolume=A(q.setVolume);this.setMute=A(q.setMute);this.setFullscreen=A(function(a){l.fullscreen(a)});this.detachMedia=function(){try{return q.getVideo().detachMedia()}catch(a){return null}};
+this.attachMedia=function(a){try{q.getVideo().attachMedia(a),"function"==typeof t&&t()}catch(b){return null}};this.setCurrentQuality=A(function(a){h().setCurrentQuality(a)});this.getCurrentQuality=function(){return h()?h().getCurrentQuality():-1};this.getQualityLevels=function(){return h()?h().getQualityLevels():null};this.setCurrentCaptions=A(function(a){l.setCurrentCaptions(a)});this.getCurrentCaptions=function(){return l.getCurrentCaptions()};this.getCaptionsList=function(){return l.getCaptionsList()};
+this.checkBeforePlay=function(){return E};this.playerReady=function(a){if(!y){l.completeSetup();s.sendEvent(a.type,a);f.utils.exists(window.jwplayer.playerReady)&&f.playerReady(a);q.addGlobalListener(m);l.addGlobalListener(m);s.sendEvent(f.events.JWPLAYER_PLAYLIST_LOADED,{playlist:f(q.id).getPlaylist()});s.sendEvent(f.events.JWPLAYER_PLAYLIST_ITEM,{index:q.item});w();q.autostart&&!g.isMobile()&&n();for(y=b;0<F.length;)a=F.shift(),I(a.method,a.arguments)}};q.addEventListener(a.JWPLAYER_MEDIA_BUFFER_FULL,
+function(){h().play()});q.addEventListener(a.JWPLAYER_MEDIA_COMPLETE,function(){setTimeout(B,25)});q.addEventListener(a.JWPLAYER_MEDIA_ERROR,function(b){b=g.extend({},b);b.type=a.JWPLAYER_ERROR;s.sendEvent(b.type,b)})}})(jwplayer);
+(function(f){f.html5.defaultskin=function(){this.text='\x3c?xml version\x3d"1.0" ?\x3e\x3cskin author\x3d"LongTail Video" name\x3d"Six" target\x3d"6.0" version\x3d"2.0"\x3e\x3ccomponents\x3e\x3ccomponent name\x3d"controlbar"\x3e\x3csettings\x3e\x3csetting name\x3d"margin" value\x3d"8"/\x3e\x3csetting name\x3d"fontcolor" value\x3d"eeeeee"/\x3e\x3csetting name\x3d"fontsize" value\x3d"11"/\x3e\x3csetting name\x3d"fontweight" value\x3d"bold"/\x3e\x3csetting name\x3d"maxwidth" value\x3d"800"/\x3e\x3c/settings\x3e\x3celements\x3e\x3celement name\x3d"background" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAaCAAAAABTb2kNAAAAGElEQVQIHWNJYXnE8pXlHwH4Hy7/m+UrAIRMGWv8AcuMAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"capLeft" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAaCAQAAADV5l4gAAAAXUlEQVQYV2NiYEj2T7mf8j/lP1O8/98NHxUeMTxiYPo74RPDM4avQMj0R+Edwz8wZPrD8B3G/AtlgEXpySTC4v9QiFPBHzjzwS+4uQW/gL77DYRMPzf+Dfj5AOR5AOEMhGrZiW/LAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"capRight" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAaCAQAAADV5l4gAAAAYUlEQVQYV2NJ+c/AwPDgf8HcjSyPgCx+Be4N8QEsX4HMrwziDFwTWP4xgMAbBikFKPMnwx8GKJOB4S+C+YeuTJwW/8cU/YdF7T8E8xfDvwcsv8GSfxkYC8CeZ3jAWPB3IwAFQj9cfrWVAwAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"divider" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAaCAYAAACdM43SAAAAEklEQVR42mP4//8/AwgzDHcGAFd5m2W1AHjxAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"playButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAAAdUlEQVR42u2TsQ3AIAwE2YARMkJGyCiMwiiMwgjUFMAIjOC8lMJdiIjd+aSrr3i9MwzjHXoYMOgFmAIvvQCT4aEXYNLvEK2ZMEKvFODQVqC1Rl/sve8Faq20cMIIvUYgQR5ZMJDh6RixQIF8NMHAgMEZhrHNDU+1T3s3o0CaAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"playButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAABhUlEQVR42uXVzUoCYRTGcXNGR3HSDPtASyIhrIjaFJlBRBRUdAUGQQurdVfSrl2LuhEvYxR1IYroRhCEWU1/4R2Yxcz4MUlQB34bGc6D58y8r+/vl2EYczNpKvitzN9/orEEGUEoQhAyJDNs2gAJCiKIYVGIQUUIAWvQNM2jWMEGtoRNpJBAFOGJgsRDAahYRRbHuMAVznGEHaSxZBNkvyPLQhXEkUEew+riE88o4AYn2BVBCcxDgWz+G6fxhLGMPdzBWh184RUPuEUOWaSwgBBkpwAZESRxiALsqoV3EXSPSxwgLUIUc1xOAWvI4RFupeENRVxjH0moCMBvF6BiHXkUMap0lPCCM2QQh2LuwingFE8Ytwa4wTYSCEEaGVCtVo1x1Gq1CQPEiDRNM9yUy2W92WyWdF13HJHrkt2aNxoNbTAYuC555Gtq17her7f6/f7HmK+p+4dmbcysO71ez8OHZnNUDBtXKpVuu932clTM/rCb/XHt/cL5/SvT+6XvKcz3r+sbpPMfjCOvfIMAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"pauseButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAAAN0lEQVR42u3NoQ0AMAwDwe6/YYBncWlUyQFBBX+SickfADM/0k+AQCbJffHfqir3hZ/ADwEAowtQ1mmQzb8rQgAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"pauseButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAABdUlEQVR42t2WzWrCQBSFq1FSaSjaFi1iF6UFtdBdF6WhC0Hoym3BlSAu+wbddSF9xfyTJ7k9gRMJuY2Oi2w88BG5zLlHZiYzOTttiUijyP768Y2bxCKVv0nD+B/T2AY2OAcdPnOKNZtjrdx/KMCi6QJ0wTW44fOKFGtdjrXzEJPml2AA7sEEPIExeCRj1iYcM6CnOoTz2AYOuAVT8Arm4APMwDuZsTbnmCk9Dns0qxbVBj3wAFzR+iRlufT02IOLrqenA/rgGSxE64uUtaCnzx7WfwEtLtYQvIClaH2Tspb0DNmjtS9gxHldidYPKWtFz+hQgAPuwBtYi9aWlLXOPPQ6JgEu2IjWLylrQ89xAVEUSRzHkiSJpGm6C8jqBVSA8RR5nie+70sQBHmjbUZWL6CmyHiRVQAXWQfoRTbapiqA21QH6G1q9KJl5jwkDMPdi6YCzF40fVSoAB4VKqDiqKj1sKv9uK71wqn9yqzt0q/vs+Wk9QeSkdKwXIKzCgAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"prevButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAcCAYAAABsxO8nAAAAfUlEQVR42u2MwQnAIAxFu4EjOIIjOFJH6EiCF8fw7BQZwf5AegkU2tje8uGR5Afe5vH8mTHGZG5+EXSzSPoMCEyzCPd+9SYRZgCFb7MIJNB5XxURT7OotTYFkql5Jqq1TiGBzrvinUj2AMqSSHXHikj3GZBVpH8R9M3j+Tgn8lcGnlSSd08AAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"prevButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAcCAYAAABsxO8nAAABhUlEQVR42uXUz0oCURTH8VKz/BNFmZJ/iMAoEmohlRRI7Yp2Qa0igyJc9Qot2vUGbnwB3yJXPYKaCi5m62LQzSymr3KE09hAi1nVgQ93hnv4wZ259878o7Jte/YXfADPcAvwIeDgFwHMKYFJoDPILw0hREQYCyKMKBZlDCEIvzMkiAhWEEdCxlURRwoZJBGTwOA4SC0nLJMb2MGujFlsIYc8DrCPrIRHZtR3mccSMtI0qTMUcYoLXKGMTxxiE8t6WSHEsI2iCirhDg94RgVDmTtHDmvjILWsBPZwqYJe8Io3vEPXDfJY10ERJGXiWjVXUYMBZ5VQQMoZlMIRblVzHSZ+qkccI62DokijgHvVbMGtnnCCjGtQu922R7rdriXPU3SQ69IajYY9MhgM6p1Ox5R3zbE0l4+tmquWZdV6vZ7hDNIf2/X3T5r17zcM40MH6d/vuiGleWpD9vv9SrPZHDLn2JAuR0QFTR0R0zTLrVbr2xHx7NB6do14drF5dtV6c/n/7foCpva8IJ04vWUAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"nextButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAcCAYAAABsxO8nAAAAdklEQVR42u3OwQnAIAyF4WzgCB3BERypI3QkwYtjeHaKjGBfIeClFmvaWx58KAg/ks329WqtBbbBW7vMhhowBH2o2/WhLoJTh0QBrw4JfhXKObcBlnMulFJqNwp4uS+HIjjCNKGDZKshhkCYJlRge/ot2Ww/7gSJGQaejWvrvwAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"nextButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAcCAYAAABsxO8nAAABjElEQVR42uXUPUvDQBwGcNvUatOK4kuKfUEERVGwg/iCguimuAk6iQqKOPkVHLr5DVz8An4LO/kR2jQtZMjaIbRLhvOpPOHOJMahnfQPP5IcyXO5S+5G/ngJIRKUpMRvwiEyIAWjPl5rlApIhgJ5YxoykIMJHnUYJx2ylGFHWjAozQdnoQBlKIIBM2RAnsdpBqa/hbHRgCWowBZswjoss30V1nhcYKe6P0w/aAoWYRua8ABncAKHcABHQlaFbz0JY/589YPm2Psxb+zBCzzCLVzBtWAxeIVvlQHND5rnUC5ArXd4hio8Ke2nsAF5OTwEcWJ32WuwHHiDV6XtnB0XIKsGlWAP7iCqXKgp15ewA8VgUBn24R5+Kk85v+EISpCLDLIsS0Rpt9sez+OC5NDq9boIarVabrfbrfE6bmhysoMhtm07nud9TTbb4iZbfn41xHGcD/Xzsz3u88sfsn9jo9HodTqd0A/JoLgfUi4R0zSbrutGLhEGxS2RwRftMLeRwTe2oW21g2/+/6c+AdO5vCABA1zBAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"elapsedBackground" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAaCAYAAACdM43SAAAAEklEQVR42mP4//8/AwgzDHcGAFd5m2W1AHjxAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderCapLeft" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAcCAYAAABCgc61AAAAD0lEQVQoFWNgGAWjYGgCAAK8AAEb3eOQAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderCapRight" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAcCAYAAABCgc61AAAAD0lEQVQoFWNgGAWjYGgCAAK8AAEb3eOQAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderCue" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAI0lEQVR42mP4//8/AzJmGG4CaWlph0EYRSA1NfXIsPQtMgYAAy5KnsvyDbIAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"timeSliderRail" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAALElEQVQY02NkQAOMg1aAmZn5P4oALy8vqoCYmBiqgIKCAqqAmpoaxQJDJsQA+54Krz/ExkoAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"timeSliderRailCapLeft" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAWklEQVR42tWLsQlAIQwFBcVKGyEGK61cJ/tXGeVptPjwN/DgQnIQ9xYxRgkhqPceLqUkW5g5Z7g91BYiQq31BDAzxhjmDb13zDnN+/IP0lr7glFKkX3oCc+wAHpnIpi5hlqoAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderRailCapRight" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAVklEQVR42tXJMQ4AIQhEURKMFZZCrLDyOty/4ijsYuJWewEn+c0buGeIGKUUr7XahtZaENHJgJmj9x7vkTnMOSMTkY2w1opMVX/BPxhjJNgBFxGDq/YAy/oipxG/oRoAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"timeSliderBuffer" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAE0lEQVQYV2NgGErgPxoeKIGhAQB1/x/hLROY4wAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"timeSliderBufferCapLeft" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAJ0lEQVQYlWNgGGrAH4jvA/F/GOc/EobLwAX+ExTA0IJhKIa1QwMAAIX5GqOIS3lSAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderBufferCapRight" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAJ0lEQVQY02NgGErgPxDfB2J/ZAEY9kcXuI8u8J+gwH2chqJYOzQAALXhGqOFxXzUAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderProgress" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAALUlEQVQYV2NgGCqA8T8QIAuwoPEZWD58+IAq8Pr1a1IF3r59iyrw9+9fhqEJABv9F+gP7YohAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderProgressCapLeft" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAASklEQVR42tXDQQ0AIAwDwDqcPhLQgAlM8JqDORilnyVY4JLDX0iaOgWZaeccVkSEKyv23nxjrcU35pyurBhjWO+dFZDWmqkr8Y0Lr65i67XRzKcAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"timeSliderProgressCapRight" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAcCAYAAABGdB6IAAAAS0lEQVQY09XDQQ0AIRAEwXa4+iYBDZjABC8c4ADmHheStUAlBc/wb9oOAM45vvfewVrL6WSM4Zzeu3Naa04npRTftdZAkiVNScFTPhkFYuvY2zeUAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"timeSliderThumb" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAcCAYAAABYvS47AAAAwElEQVR42tWTPQrCQBCF84OsYJCIYEQrsZAU6QKx9xheyG4L6zTZs3iInGZ9Tx4iAWHaDHwwvPlgyWY2mVvFGNNf/gmZyEUm0q+kwQI4sBROWf6R2ShcgRJsRanM0UnUrEEFTuBC1FeaOYoF2IMaXMGNqK81KyhuwDmEcB/H8RVV7JlxRofiDjTe+0eclLKGDsUDaPu+91NRWUuH4hF0wzA8p6Kyjo5ZNB9t/hjz9Zgv3PwLzUthXjPT4hqewrzqDfMnQ2tu8Pr1AAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"durationBackground" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAaCAYAAACdM43SAAAAEklEQVR42mP4//8/AwgzDHcGAFd5m2W1AHjxAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"hdButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAcCAMAAACu5JSlAAAAZlBMVEUAAACysrLZ2dkmJiYuLi4xMTE3Nzc8PDxAQEBJSUlRUVFSUlJaWlpdXV1jY2NpaWlsbGx0dHR3d3d4eHh9fX2KioqPj4+SkpKVlZWXl5ehoaGpqamsrKyysrK3t7fCwsLNzc3Z2dkN+/dcAAAAA3RSTlMAf3+Sa81KAAAAh0lEQVQoU+3J0RpCQBCA0dW/i02KpEIzzPu/ZJc+7CM4t8e5k3PuYgmX9VNttv2W2iww9gDhe/iK3mZYHhRVIBwe+l9PYQWjzbB/BYB6gdl096ra4WP0PD/kqh25qq4vIjfuIvBuuMrkaURk8yUvGUAiefSU0/5hkJZSPECcZP8J62epztzpDzcuFrDsGN7pAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"hdButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAcCAYAAACZOmSXAAACFUlEQVR42u2WsWoCQRCGE42I5AikkSBaGSwsAiIpQi4BK0vF+qwEjb1gaWMlaGfvA5xYWvgCNraChY0+gU+wmR3+DcPGC0lQrnHg43bvbv5/d25v764uYYdS6voc/MY0AqLEzYmICt3roJlGiRgRJxLELXD+g8hPQDPGHnIAwjiOpHsiSaSINMj8CeRBIwlNBx7RY8Z3xAORJZ6IZ+KFeCXcP/KK3GdoZbU2POLGPIJyOLiYJ96ICuERDaJJtIiPX9JCTgMaFWjm4eHIBRZHWR6Jd8JXpw8f2o/aS5Y8QSRRnqo6X1ThkTTmN1iRKTwfz87o9/sql8updrutTBSLRT63WCzUZDLhtoCvT6dTW8qDR8o2T2OBNL5leJ4WZBMd+/3+y+RwOKhut8vtUqnE92JgfLSiAY+0NHeIDFZo085gI5gvl0s+GjMKPpoq2IOzogmPzDFzl1eriPV6zSI2eAw8c/TZ1M6RAW33R/PtdqsMo9GIRQqFgqrVagy1+dxwOFSz2YzbrutaOeIckOaBZd9sNgro2bFQp9Mx575m5fu+6vV63K7X63xttVqZwfE1qSXLHrjgZEK5XGah8XjM/fl8bsx1nyuBWcqq6DweiNSSCy7wVZMJMNKm3B8MBkac+zCT8CBgLLFetYBNBjefHLnJBG6vu93OP7Wx1pTba6gfllA/qaH+TIT6GxXaD2Q4v86XoPgE1h55oNE1QD4AAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"hdButtonOff" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAcCAMAAACu5JSlAAAAYFBMVEUAAABZWVlzc3MmJiYpKSkqKiosLCwvLy8yMjI1NTU5OTk8PDw+Pj4/Pz9CQkJERERFRUVHR0dMTExOTk5PT09RUVFVVVVWVlZZWVlaWlpcXFxfX19kZGRpaWlubm5zc3OfG0yNAAAAA3RSTlMAf3+Sa81KAAAAhklEQVQoU+3JQRaCIBRAUeyBkKlZiX1J/fvfZUOPyBK802vMxRhz04Lb/qVWPf6LVtUxRwD3PX1D1BW2Ht843Okh/iJePbOukP8CAO0Gqy7Zp5QGbAiW54c6pYE6pbS/iDQ8RODdcZfJ0onI4T2DjCCBOlj8lD+M0uPFAoRJ8i/Yvyp1ZS5/fAoUStSjBUoAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"ccButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAcCAMAAACqEUSYAAAAXVBMVEUAAACysrLZ2dkmJiYuLi4xMTFAQEBHR0dJSUlKSkpRUVFSUlJaWlpdXV1jY2N0dHR9fX1/f3+Pj4+SkpKVlZWXl5ehoaGpqamsrKytra2ysrK3t7fCwsLNzc3Z2dky1qB2AAAAA3RSTlMAf3+Sa81KAAAAe0lEQVR42uXNQRKCMBAAQWCCIgGCGEU3sv9/JpXykCLxB8y1D1OdsEaLmqT6p6M6wKn6FuyWaUQL9zdcW2yuLV49dmTUL2S6gcYsr+IbwgdC7MYj/EoqIoZFHF1PL08QkYNO0MG8wMUw5LoOwCQyG+jWTMuS1iXW1SnbAaDLE32SOX+lAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"ccButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAcCAYAAACdz7SqAAAB8UlEQVR42uWWsWoCQRCGEzUcEhFsQpCzUiwsBBGLoElrp0HbsxI09j6ClaXgW5xYWvgCNhaWFjb6BD7BZmb5HWSXXAw5rnHg43bd3f/fG+f27uE+Qyn1GCa3mMVAnEj8k7jowdwyxKQnwiGSxDNI/Qmsg4YDzbh15/jRwaIM8UJkCRfkbsQFWWhkoOmwh2nqEGnilcgTZaJGvBF1onEjdaypQSMPzbRlzLvBYIl4J9qER/SJATEkvn5hiLl9rG1DqwTtFFId06ZIQ4H4IHwVXvjQLMDDkcJC/svEpwo5oFmGR1JSjD++ptNixGQyUcViUeD+JRaLhapWqzLmeZ46n8+mhAftLKo6cTF1UQB921AEpT2bzdRms5F+q9Vic5lnRB/armmaI+ooBAkI6TvCnYnwaDTitr5ynE4n2YQRA9aGR8o0baAKOXSaRMQOufP1eq2CApqNQNPD4aCY3W4nptS36Ha7emy5XHL/R4JNkd79fq8uVCoVLez7vu5Pp1Pd73Q6qtfrcZuvemy1WskmrzQC0yuFdL1gPB5rERhJez6f80ak32w29QbxHxumdiFZj8z1gu12KwUD9EYwzuYwk43xGsPUfmSswwGTwyLwcJBj8Hg8+mEZklbgMRj9gR/9qy36l3j0nyuRfphF+wl69/ENcVv6gzz3ulwAAAAASUVORK5CYII\x3d"/\x3e\x3celement name\x3d"ccButtonOff" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAcCAYAAACdz7SqAAAA7klEQVR42u2RvQqEQAyEfRpBG8GfQhALQWxEK0VFsLax8QH20XM3C0kjB96ujbADgxmi+bKu5+Tk9C6d56m+poes7kLpSRtBm6Yh3/fZyNIbx5HCMJRenud0HIcFVIAyUOq2bWnbNslpmgLO71lBeRBOxCeTwWVZosZT9/Z95yXMofhN1yFiOfmyLPZ3uq4rwdM0MRT54iRJdK/rOuRfvged55nYQRDIHSJXVaVzHMeUZRlqPHWv73teEpn9P7QoCgxhkNR1XWMRyVEUYUG+bzvoMAx8d2wswn3AGcaL4RszqKWNoOpBqPKcnJxeqw8HMtsZ4xog6gAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"muteButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAcCAYAAACQ0cTtAAAA30lEQVR42u2UzQmEMBCFtwNLsARLSAkpwVJSwpZgCQEv6skS5iieLCElzL6FJwxCDlllT3nwkb8hXxLQV01Nzc/Z9739l8gBBRE0j94AiBk3oAceJCCPCM2GauY6zh3AsR/vit5AT8zzBbZCoWdNWypQS0YmQM2tekpDkWzbNs1xqRMQwGraMtk8z5rD1k3TJJgLYF2WZfi2oEw2jqPm4HoHhHMOJNCDAxTLnGHIyALXhRLPmnsfOU+dTpkRJooc+/F1N/bpzLjhITxFAp77i1w3440UxALRzQPU1NTk8gF0y3zyjAvd3AAAAABJRU5ErkJggg\x3d\x3d"/\x3e\x3celement name\x3d"muteButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAcCAYAAACQ0cTtAAAC2UlEQVR42u3WPUwTYRzHcWmBFnqKBYpAHVSQoEB8QTQaiMSILhgDiiFxUBMSlUETnYiDg9GJmDA44OCgo8bF18EFibq5MEBpeUsDIaVAm6P02qTUb5N/k5P2oNg46ZN88tz1yT2//p9e77lt/1u6Fo/Hc9L5GwEmmJGrY4bpz0JlcoOAPFhRCAU2FMAi46YtBa4LyEM+LBKwHSUoh1OUYaeM5yUDtxpSAAVFKJZJd6MGh9GEY6jHXjigpAQaBskySQWlcMpE+3FQJj+DDtxBN9pxCjUogw25yEkJEWbkw4ZiqaBWJm9GK86jEz0YRKKNok9Cm1El11th/i1QF2TBDuxCtYS0oQv3MIObuI+nGMIwIljAQ1xGI5xQINWlBhXBiTqclgtv4xXCUsUTDOADotAwIsce9OIsqmFHPkzJsORvpKACDVLNNfThJ/TtBb7ADRfCEjQm4/3okHkcyaXU3xAW2FEtFW3U3uAbVDn3IQYvQhjGVTSiHIX6MDMK4EA9LsRisbgR2jt8wg/OtbW1NZU+Qu+nX6T/zth1nEBl8q5cH1aGQ+icmpqKG9GHeb1ebWlpSZ2bm4v4fL7A7OzsIn1GYQ7Uod3lcsWN0N6GQqGhyclJNXG+srLic7vdseXlZa/H4wkRnLKMRr9ZFVr8fv8jLh4MBAKv+fbudWEvCfs8Pz/vUVXVRbXaxMRENBgMjiXGV1dX094g6e7GcqmuFVfQiwcszfvx8fGwhPXjGYEf+SxKNRqhI4nj6elpw1vf6A9dgRo0yUWXcINv/piJvRzfRV80Gh1gBb6yAsMERahugc82/FOnC1RQonvYHkELzoXD4S76i+jGLYKeJ6qlolGCtvC4gv5Jr9tGKrEPB9CAoziJNnRqmtaz2YM40+3FCgV2OHT71x7UStXH0ZTJFpNpqEWqtUnFRShFxWabZ1bvHLpd2yrhijB4LcjyXSSLF56sw4WE/HPtFwoiecfnKRGcAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"unmuteButton" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAcCAYAAACQ0cTtAAAAk0lEQVR42u2NwQnDMAxFtUFH6AgdISN0hI6UEf4Oxgdvkas9RUZQ/yEBYdChgoZC9eCBLBs/SZLkjxlj3Ol2RehJd6rfDq1UT81eKcwZVCMB9Zw/p7CzfErvXT2ndzB3kAitNfUUQ60V555zLFZKUU/zBscOdo7EFiOcmFLMcQli4y+6Bz4LBx90E3JV8CZJkvwsb8qa9F25tXYIAAAAAElFTkSuQmCC"/\x3e\x3celement name\x3d"unmuteButtonOver" src\x3d"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAcCAYAAACQ0cTtAAACOUlEQVR42u3WS2sTURjG8ZqJuTSJTW1T26YqrWmN1jt2ISpWTb1ABS3iRkS84WUndlNQFN34Fdy5d+U36MJVQVroKgnmvgqBZBV3Gf8DTyQMzMggRZC+8CNnJsn75CRnzqRvu/6/Mk1zRw8fwBhbEeSDAT92ih+cU7D8dYiahxFFTPoR1HOG+Fxm7h6kRiE1H8Y49iKJEcQRRRghhQegmTuFKkQMBBDBbkwgjVOY0+Mh7McoEhjSa+OIIawehluYgSB2YQ9SOI0MbuEFfuCizs8ijYOYwRSSCo8g0J2hU9AAkmp0AbfxDJ/RhlV3sYgFZPR4GedwApMKDMNvD+v+RlGM4aga3McKvqO3XuKhxt/wFI+xClOBScTU12dfEEEMIqUZudU7vMKajjewrvGqZjiFOAL2MANhJHAENzqdjumE+ojXeMvxJkyxAh/hEqYxiKBT2AiOY6lQKJhOesNqtdpm93y1WvUUlsAsFrPZrOmEeo/lcrm8Zh1XKpUNxuvWuFgsun6N9t/sAM43Go0PzWbzU6vV+sInztvClvHEGpdKpd8LxArinPMCsa9GjGp287iD51ip1+tfc7ncTzV7gJu4igVc8bL07Rf0GGYwhwyWcI9Zvsnn80XG13EGx3AYafzxonYKjOoNE2pyEmcx3263r2nLmu7ZJ4e9b1ew7fQxhY5jUgEp7FPIAPq9bcTut...
[truncated message content] |
|
From: <fg...@us...> - 2013-12-08 11:58:45
|
Revision: 4462
http://openutils.svn.sourceforge.net/openutils/?rev=4462&view=rev
Author: fgiust
Date: 2013-12-08 11:58:41 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
add image with/height without using style when not using em
Modified Paths:
--------------
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/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-12-08 11:46:29 UTC (rev 4461)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-12-08 11:58:41 UTC (rev 4462)
@@ -124,12 +124,16 @@
</c:if>
<c:if test="${not ignoreDim}">
<c:if test="${ size[0] gt 0}">
- <c:set var="style">${style}${(!empty style)?';':''}width:${size[0]*emRatio}${(not useEm ? 'px':'em')}
- </c:set>
+ <c:choose>
+ <c:when test="${!useEM}"><![CDATA[ width="${su:toFloorLong(size[0])}"]]> </c:when>
+ <c:otherwise><c:set var="style" value="${style}${(!empty style)?';':''}width:${size[0]*emRatio}em" /></c:otherwise>
+ </c:choose>
</c:if>
<c:if test="${ size[1] gt 1}">
- <c:set var="style">${style}${(!empty style)?';':''}height:${size[1]*emRatio}${(not useEm ? 'px':'em')}
- </c:set>
+ <c:choose>
+ <c:when test="${!useEM}"><![CDATA[ heigth="${su:toFloorLong(size[1])}"]]></c:when>
+ <c:otherwise><c:set var="style" value="${style}${(!empty style)?';':''}height:${size[1]*emRatio}em" /></c:otherwise>
+ </c:choose>
</c:if>
</c:if>
<c:if test="${not empty cssClass}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 11:46:33
|
Revision: 4461
http://openutils.svn.sourceforge.net/openutils/?rev=4461&view=rev
Author: fgiust
Date: 2013-12-08 11:46:29 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
remove bobo patch
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/com/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-12-08 11:46:29 UTC (rev 4461)
@@ -11,6 +11,7 @@
<packaging>war</packaging>
<artifactId>magnolia-test-webapp</artifactId>
<name>Magnolia test webapp</name>
+ <inceptionYear>2009</inceptionYear>
<description>A basic Magnolia webapp that can be used while developing openutils magnolia modules</description>
<version>0.1-SNAPSHOT</version>
<dependencies>
@@ -113,14 +114,14 @@
-->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -219,15 +220,9 @@
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.5.5</version><!-- temporarily used for bobo-browse patch -->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlvanityurl</artifactId>
+ <version>5.0.10-SNAPSHOT</version>
</dependency>
</dependencies>
<dependencyManagement>
@@ -334,4 +329,4 @@
</snapshots>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-12-08 11:46:29 UTC (rev 4461)
@@ -1,7 +1,7 @@
/**
*
* Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
- * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 11:43:27 UTC (rev 4460)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-12-08 11:46:29 UTC (rev 4461)
@@ -142,11 +142,11 @@
<scope>test</scope>
<version>${magnolia.version}</version>
</dependency>
+ <!-- jackrabbit 2.4
<dependency>
<groupId>com.browseengine.bobo</groupId>
<artifactId>bobo-browse</artifactId>
- <version>3.2.0</version>
- <!-- <version>2.5.1</version> for jackrabbit 2.4 -->
+ <version>2.5.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -154,7 +154,19 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>bobo-browse</artifactId>
+ <version>3.2.0.lucene36</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>fastutil</groupId>
<artifactId>fastutil</artifactId>
<version>5.0.5</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 11:43:32
|
Revision: 4460
http://openutils.svn.sourceforge.net/openutils/?rev=4460&view=rev
Author: fgiust
Date: 2013-12-08 11:43:27 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
webapp 3.0 xsd + disable url rewriting
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml 2013-12-08 08:27:42 UTC (rev 4459)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml 2013-12-08 11:43:27 UTC (rev 4460)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd" version="2.5">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<description>Magnolia</description>
<display-name>magnolia</display-name>
<distributable />
@@ -68,4 +69,7 @@
<page-encoding>UTF-8</page-encoding>
</jsp-property-group>
</jsp-config>
+ <session-config>
+ <tracking-mode>COOKIE</tracking-mode>
+ </session-config>
</web-app>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 08:27:46
|
Revision: 4459
http://openutils.svn.sourceforge.net/openutils/?rev=4459&view=rev
Author: fgiust
Date: 2013-12-08 08:27:42 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
MEDIA-309 Download-link is not rendered
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-12-07 21:11:44 UTC (rev 4458)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-12-08 08:27:42 UTC (rev 4459)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -31,6 +32,7 @@
import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import info.magnolia.objectfactory.Components;
import info.magnolia.templating.functions.TemplatingFunctions;
@@ -48,6 +50,7 @@
import java.util.Map;
import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.servlet.ServletException;
@@ -60,6 +63,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
@@ -510,15 +514,58 @@
if (media == null)
{
+ try
+ {
+ response.sendError(404);
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
return null;
}
+
MediaTypeConfiguration mtc = Components
.getComponent(MediaConfigurationManager.class)
.getMediaTypeConfigurationFromMedia(media);
+
+ if (mtc == null)
+ {
+
+ // path points to a node but not a media
+ try
+ {
+ response.sendError(404);
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+ return null;
+ }
String url = mtc.getHandler().getUrl(media);
String filename = mtc.getHandler().getFullFilename(media);
+ try
+ {
+ if (media.hasNode(BaseTypeHandler.ORGINAL_NODEDATA_NAME))
+ {
+ Node original = media.getNode(BaseTypeHandler.ORGINAL_NODEDATA_NAME);
+ String mime = PropertyUtil.getString(original, FileProperties.PROPERTY_CONTENTTYPE);
+
+ if (StringUtils.isNotEmpty(mime))
+ {
+ this.response.setContentType(mime);
+ }
+ }
+ }
+ catch (RepositoryException e)
+ {
+ // should not happen
+ log.debug(e.getMessage(), e);
+ }
+
this.response.addHeader("Content-Disposition", "attachment; filename=" + filename);
try
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-12-07 21:11:44 UTC (rev 4458)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-12-08 08:27:42 UTC (rev 4459)
@@ -223,7 +223,7 @@
{
try
{
- return !media.hasProperty(ORGINAL_NODEDATA_NAME);
+ return !media.hasNode(ORGINAL_NODEDATA_NAME);
}
catch (RepositoryException e)
{
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml 2013-12-08 08:27:42 UTC (rev 4459)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-download" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ae0cc614-772b-4aba-8eab-4857dec74e50</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/media/download/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>forward:/.magnolia/pages/mediaFolderView.html?command=download&path=/$1</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-12-07T23:13:04.690+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.virtualURIMapping.media-download.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-12-07 21:11:44 UTC (rev 4458)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-12-08 08:27:42 UTC (rev 4459)
@@ -502,7 +502,7 @@
[/#if]
[#if !media.external]
<li>
- <a href="?command=download&path=${media.handle}" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-download.png');">
+ <a href="${this.request.contextPath}/media/download${media.handle}" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-download.png');">
<span>${this.msgs.get('media.download')}</span>
</a>
</li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4458
http://openutils.svn.sourceforge.net/openutils/?rev=4458&view=rev
Author: fgiust
Date: 2013-12-07 21:11:44 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
MEDIA-295 Cross-site scripting vulnerability in mediaFolderView.html
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-12-03 08:49:28 UTC (rev 4457)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-12-07 21:11:44 UTC (rev 4458)
@@ -38,7 +38,7 @@
new MediaFolderView.Sorting('sorting', this.options);
new MediaFolderView.EditMenus('li.media .menuitem');
new MediaFolderView.InfoTooltips('li.media .image');
- Cookie.write('mediafolderpath', '${this.path!}', {duration: 30});
+ Cookie.write('mediafolderpath', '${this.path!?js_string}', {duration: 30});
[#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
this.openPlaylistFromSearchDialog();
[/#if]
@@ -327,7 +327,7 @@
<body id="mediafolderview" class="bg-${this.bgSelector}">
<form action="" style="display:none" id="actionForm" method="post">
<input type="hidden" id="actionCmd" name="command" value="delete" />
- <input type="hidden" id="actionPath" name="path" value="${this.path!""}" />
+ <input type="hidden" id="actionPath" name="path" value="${this.path!?html!""}" />
<input type="hidden" id="actionSearch" name="search" value="${this.search!""}" />
<input type="hidden" id="actionNode" name="node" />
<input type="hidden" id="actionDest" name="dest" />
@@ -337,7 +337,7 @@
[/#if]
<input type="hidden" name="search" value="${this.search!''}" />
[#if this.path?exists]
- <input type="hidden" name="path" value="${this.path}" />
+ <input type="hidden" name="path" value="${this.path!?html!""}" />
[/#if]
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-03 08:49:31
|
Revision: 4457
http://openutils.svn.sourceforge.net/openutils/?rev=4457&view=rev
Author: fgiust
Date: 2013-12-03 08:49:28 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
don't add extensions to link with parameters or ending /
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-11-15 15:24:06 UTC (rev 4456)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-12-03 08:49:28 UTC (rev 4457)
@@ -227,22 +227,10 @@
// Check if there is already an extensions, else add default one
if (cleanedurl.startsWith("/"))
{
- String configuredExtension = Components.getComponent(ServerConfiguration.class).getDefaultExtension();
+ cleanedurl = Components.getComponent(I18nContentSupport.class).toI18NURI(cleanedurl);
+ cleanedurl = contextPath + cleanedurl;
- if (StringUtils.isNotBlank(configuredExtension))
- {
-
- String defaultExtension = "." + configuredExtension;
- cleanedurl = Components.getComponent(I18nContentSupport.class).toI18NURI(cleanedurl);
- cleanedurl = contextPath + cleanedurl;
-
- if (!cleanedurl.endsWith(defaultExtension) && cleanedurl.indexOf(".") < 0)
- {
- return cleanedurl + defaultExtension;
- }
- }
-
- return cleanedurl;
+ return addDefaultExtension(cleanedurl);
}
// Check if uuidOrPathOrUrl is an UUID
@@ -261,6 +249,27 @@
return cleanedurl;
}
+ private static String addDefaultExtension(String url)
+ {
+ String configuredExtension = Components.getComponent(ServerConfiguration.class).getDefaultExtension();
+
+ if (StringUtils.isNotBlank(configuredExtension))
+ {
+
+ String defaultExtension = "." + configuredExtension;
+
+ if (!url.endsWith(defaultExtension)
+ && !StringUtils.contains(url, ".")
+ && !StringUtils.contains(url, "?")
+ && !StringUtils.endsWith(url, "/"))
+ {
+ return url + defaultExtension;
+ }
+ }
+
+ return url;
+ }
+
/**
* Create an html complete link from a string composed by link \t link text. If the link is empty the function
* return only the text
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-15 15:24:08
|
Revision: 4456
http://openutils.svn.sourceforge.net/openutils/?rev=4456&view=rev
Author: fgiust
Date: 2013-11-15 15:24:06 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2013-11-15 15:24:00 UTC (rev 4455)
+++ trunk/openutils-bshd5/pom.xml 2013-11-15 15:24:06 UTC (rev 4456)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-3.0.0</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-3.0.0</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-bshd5-3.0.0</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-bshd5</url>
</scm>
<build>
<testResources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-15 15:24:03
|
Revision: 4455
http://openutils.svn.sourceforge.net/openutils/?rev=4455&view=rev
Author: fgiust
Date: 2013-11-15 15:24:00 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-bshd5-3.0.0
Added Paths:
-----------
tags/openutils-bshd5-3.0.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-15 15:23:52
|
Revision: 4454
http://openutils.svn.sourceforge.net/openutils/?rev=4454&view=rev
Author: fgiust
Date: 2013-11-15 15:23:49 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-3.0.0
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2013-11-15 15:18:35 UTC (rev 4453)
+++ trunk/openutils-bshd5/pom.xml 2013-11-15 15:23:49 UTC (rev 4454)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-bshd5</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-3.0.0</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-3.0.0</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-bshd5-3.0.0</url>
</scm>
<build>
<testResources>
@@ -190,7 +190,7 @@
<hibernate.driver>org.hsqldb.jdbcDriver</hibernate.driver>
<hibernate.url>jdbc:hsqldb:mem:daotest</hibernate.url>
<hibernate.user>sa</hibernate.user>
- <hibernate.password></hibernate.password>
+ <hibernate.password />
<hibernate.dialect>org.hibernate.dialect.HSQLDialect</hibernate.dialect>
</properties>
<dependencies>
@@ -208,7 +208,7 @@
<hibernate.driver>org.apache.derby.jdbc.EmbeddedDriver</hibernate.driver>
<hibernate.url>jdbc:derby:memory:daotest;create=true</hibernate.url>
<hibernate.user>sa</hibernate.user>
- <hibernate.password></hibernate.password>
+ <hibernate.password />
<hibernate.dialect>org.hibernate.dialect.DerbyTenSevenDialect</hibernate.dialect>
</properties>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-15 15:18:39
|
Revision: 4453
http://openutils.svn.sourceforge.net/openutils/?rev=4453&view=rev
Author: fgiust
Date: 2013-11-15 15:18:35 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
license header
Modified Paths:
--------------
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Sticker.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.dao.hibernate;
import it.openutils.hibernate.example.ExampleTree;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.dao.hibernate;
import it.openutils.hibernate.example.ExampleTree;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.example;
import it.openutils.hibernate.selectors.ExcludeBackrefPropertySelector;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.example;
import java.lang.reflect.Array;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.example;
import org.hibernate.Criteria;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.example;
import it.openutils.hibernate.selectors.ExcludeBackrefPropertySelector;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.paging;
import java.io.Serializable;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.paging;
import java.util.Collection;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.paging;
import java.util.Collection;
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/selectors/ExcludeBackrefPropertySelector.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.selectors;
import java.io.Serializable;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test;
import it.openutils.hibernate.test.model.Address;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFilterMetadataTest.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test;
import static it.openutils.hibernate.test.EntityBuilder.bobsPrius;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOFindIdentifierTest.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test;
import it.openutils.hibernate.example.ExampleTree;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOHierarchyTest.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test;
import it.openutils.dao.hibernate.HibernateDAOImpl;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test;
import it.openutils.hibernate.test.dao.BarDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test;
import static it.openutils.hibernate.test.EntityBuilder.alice;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.dao;
import it.openutils.dao.hibernate.HibernateDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.dao;
import it.openutils.dao.hibernate.HibernateDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/CarMakerDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.dao;
import it.openutils.dao.hibernate.HibernateDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.dao;
import it.openutils.dao.hibernate.HibernateDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.dao;
import it.openutils.dao.hibernate.HibernateDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/StickerDAO.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.dao;
import it.openutils.dao.hibernate.HibernateDAO;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.Column;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.Entity;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Car.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import java.util.ArrayList;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarMaker.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import java.util.ArrayList;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.CascadeType;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CurrencyAmount.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.Embeddable;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Designer.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import java.util.HashSet;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Employee.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import java.util.Calendar;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.Column;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.Column;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Owner.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import java.util.HashSet;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import java.util.Calendar;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Sticker.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Sticker.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Sticker.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
import javax.persistence.Column;
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java 2013-11-14 10:41:35 UTC (rev 4452)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java 2013-11-15 15:18:35 UTC (rev 4453)
@@ -2,7 +2,7 @@
*
* openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2013, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
package it.openutils.hibernate.test.model;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2013-11-14 10:41:39
|
Revision: 4452
http://openutils.svn.sourceforge.net/openutils/?rev=4452&view=rev
Author: diego_schivo
Date: 2013-11-14 10:41:35 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Merged revisions 4451 via svnmerge from
svn+ssh://die...@sv.../p/openutils/code/magnoliamodules/trunk
........
r4451 | diego_schivo | 2013-11-14 11:33:12 +0100 (Thu, 14 Nov 2013) | 1 line
MEDIA-307 FitInAndFillWithBandsImageResolutionProcessor: same height, different width
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4451&view=rev
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Index: magnoliamodules/branches/magnolia44
===================================================================
--- magnoliamodules/branches/magnolia44 2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44 2013-11-14 10:41:35 UTC (rev 4452)
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276
+/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270,4275-4276,4451
\ No newline at end of property
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 10:41:35 UTC (rev 4452)
@@ -272,7 +272,9 @@
AffineTransform at = new AffineTransform();
double delta = ((double) x) / original.getWidth();
- if (x > original.getWidth())
+ // MEDIA-307
+ // if (x > original.getWidth())
+ if (x >= original.getWidth())
{
at.scale(delta, delta);
at.translate((canvasX - x) / (2 * delta), (canvasY - y) / (2 * delta));
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 10:33:12 UTC (rev 4451)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 10:41:35 UTC (rev 4452)
@@ -60,5 +60,14 @@
src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100;bw')}" />
</div>
</div>
+ <!--
+ <div>
+ <h3>MEDIA-307</h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o1000x600;background=FFFFFF')</pre> <img
+ src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o1000x600;background=FFFFFF')}" />
</div>
+ </div>
+ -->
+ </div>
</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...> - 2013-11-14 10:33:15
|
Revision: 4451
http://openutils.svn.sourceforge.net/openutils/?rev=4451&view=rev
Author: diego_schivo
Date: 2013-11-14 10:33:12 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
MEDIA-307 FitInAndFillWithBandsImageResolutionProcessor: same height, different width
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 09:43:21 UTC (rev 4450)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-11-14 10:33:12 UTC (rev 4451)
@@ -274,7 +274,9 @@
AffineTransform at = new AffineTransform();
double delta = ((double) x) / original.getWidth();
- if (x > original.getWidth())
+ // MEDIA-307
+ // if (x > original.getWidth())
+ if (x >= original.getWidth())
{
at.scale(delta, delta);
at.translate((canvasX - x) / (2 * delta), (canvasY - y) / (2 * delta));
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 09:43:21 UTC (rev 4450)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-11-14 10:33:12 UTC (rev 4451)
@@ -62,5 +62,14 @@
<img src="${media:urlres(mediaNode, 'n100x100;bw')}" />
</div>
</div>
+ <!--
+ <div>
+ <h3>MEDIA-307</h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o1000x600;background=FFFFFF')</pre> <img
+ src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o1000x600;background=FFFFFF')}" />
</div>
+ </div>
+ -->
+ </div>
</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...> - 2013-11-14 09:43:24
|
Revision: 4450
http://openutils.svn.sourceforge.net/openutils/?rev=4450&view=rev
Author: diego_schivo
Date: 2013-11-14 09:43:21 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
magnolia-test-webapp/pom.xml
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2013-11-02 15:12:50 UTC (rev 4449)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2013-11-14 09:43:21 UTC (rev 4450)
@@ -112,7 +112,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.4-SNAPSHOT</version>
+ <version>4.1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.5.3-SNAPSHOT</version>
+ <version>4.5.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 15:12:54
|
Revision: 4449
http://openutils.svn.sourceforge.net/openutils/?rev=4449&view=rev
Author: fgiust
Date: 2013-11-02 15:12:50 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
adds a couple of shortcut methods
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2013-11-02 14:03:24 UTC (rev 4448)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2013-11-02 15:12:50 UTC (rev 4449)
@@ -107,14 +107,20 @@
Criteria add(Criterion criterion);
/**
- * Add an {@link Order ordering} to the result set. Only <strong>one Order criterion per query</strong> can be
- * applied. Any Order added after the first one will be ignored.
+ * Add an {@link Order ordering} to the result set.
* @param order The {@link Order order} object representing an ordering to be applied to the results.
* @return this (for method chaining)
*/
Criteria addOrder(Order order);
/**
+ * Add an {@link Order ordering} for score to the result set. Shortcut for .addOrder(Order.desc("@jcr:score")).
+ * @param order The {@link Order order} object representing an ordering to be applied to the results.
+ * @return this (for method chaining)
+ */
+ Criteria addOrderByScore();
+
+ /**
* Set a limit upon the number of objects to be retrieved.
* @param maxResults the maximum number of results
* @return this (for method chaining)
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2013-11-02 14:03:24 UTC (rev 4448)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2013-11-02 15:12:50 UTC (rev 4449)
@@ -36,20 +36,31 @@
private String[] values;
- public InExpression(String nodeName, String[] values)
+ private boolean useContains;
+
+ public InExpression(String nodeName, String[] values, boolean useContains)
{
this.nodeName = nodeName;
this.values = values;
+ this.useContains = useContains;
}
+ public InExpression(String nodeName, String[] values)
+ {
+ this(nodeName, values, true);
+ }
+
public String toXPathString(Criteria criteria) throws JCRQueryException
{
StringBuilder inClause = new StringBuilder("( ");
for (int i = 0; i < values.length; i++)
{
- String containsPredicate = Restrictions.contains(nodeName, values[i]).toXPathString(criteria);
- inClause.append(containsPredicate);
+ String predicate = useContains
+ ? Restrictions.contains(nodeName, values[i]).toXPathString(criteria)
+ : Restrictions.eq(nodeName, values[i]).toXPathString(criteria);
+
+ inClause.append(predicate);
// if this is not the last value, append an 'or'
if ((i + 1) != values.length)
{
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2013-11-02 14:03:24 UTC (rev 4448)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2013-11-02 15:12:50 UTC (rev 4449)
@@ -347,6 +347,16 @@
}
/**
+ * Apply a restriction on the node primary type. Shorcut for add(Restrictions.eq("@jcr:primaryType", value)).
+ * @param nodetypes - list of accepted nodetypes.
+ * @return Criterion
+ */
+ public static Criterion hasNodeType(String... nodetypes)
+ {
+ return new InExpression("@jcr:primaryType", nodetypes, false);
+ }
+
+ /**
* Group expressions together in a single conjunction (A and B and C...)
* @return Conjunction
*/
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2013-11-02 14:03:24 UTC (rev 4448)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2013-11-02 15:12:50 UTC (rev 4449)
@@ -115,6 +115,15 @@
/**
* {@inheritDoc}
*/
+ public Criteria addOrderByScore()
+ {
+ orderEntries.add(new OrderEntry(Order.desc("@jcr:score"), this));
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public Criteria setBasePath(String path)
{
// check if the specified path is already an xpath query
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 14:03:28
|
Revision: 4448
http://openutils.svn.sourceforge.net/openutils/?rev=4448&view=rev
Author: fgiust
Date: 2013-11-02 14:03:24 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
license headers
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/
magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt
magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt 2013-11-02 14:03:24 UTC (rev 4448)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/com/browseengine/bobo/api/BoboIndexReader.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,7 +1,7 @@
/**
*
- * Tagcloud module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltagcloud.html)
- * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
// lucene 3.6 compatibility patch for bobo-browse 3.2.0, see https://github.com/senseidb/bobo/commit/e78d91ef8a00965d8d55c819f967cac172c23d17
/**
* Bobo Browse Engine - High performance faceted/parametric search implementation
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package info.magnolia.module.development;
import info.magnolia.init.MagnoliaConfigurationProperties;
Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-11-02 14:03:24 UTC (rev 4448)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>magnolia5-test-webapp</artifactId>
- <name>Magnolia test webapp</name>
+ <name>Magnolia5 test webapp</name>
<description>A basic Magnolia webapp that can be used while developing openutils magnolia modules</description>
<version>0.1-SNAPSHOT</version>
<dependencies>
Added: magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml (rev 0)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml 2013-11-02 14:03:24 UTC (rev 4448)
@@ -0,0 +1,25 @@
+<assembly>
+ <id>openutils-test-webapp</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>crlf</lineEnding>
+ <directory>${basedir}/src/main/bundle</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/java/</directory>
+ <outputDirectory>/sources/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia5-test-webapp/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt (rev 0)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt 2013-11-02 14:03:24 UTC (rev 4448)
@@ -0,0 +1,16 @@
+
+${name} (${url})
+Copyright(C) ${year}, Openmind S.r.l. http://www.openmindonline.it
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia5-test-webapp/src/main/etc/header.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,35 +1,20 @@
/**
- * This file Copyright (c) 2003-2013 Magnolia International
- * Ltd. (http://www.magnolia-cms.com). All rights reserved.
*
+ * Magnolia5 test webapp (http://openutils.sourceforge.net/magnolia5-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
*
- * This file is dual-licensed under both the Magnolia
- * Network Agreement and the GNU General Public License.
- * You may elect to use one or the other of these licenses.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This file is distributed in the hope that it will be
- * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
- * Redistribution, except as permitted by whichever of the GPL
- * or MNA you select, is prohibited.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 1. For the GPL license (GPL), you can redistribute and/or
- * modify this file under the terms of the GNU General
- * Public License, Version 3, as published by the Free Software
- * Foundation. You should have received a copy of the GNU
- * General Public License, Version 3 along with this program;
- * if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 2. For the Magnolia Network Agreement (MNA), this file
- * and the accompanying materials are made available under the
- * terms of the MNA which accompanies this distribution, and
- * is available at http://www.magnolia-cms.com/mna.html
- *
- * Any modifications to this file must keep this entire header
- * intact.
- *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package info.magnolia.module.delta;
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 13:52:15 UTC (rev 4447)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-11-02 14:03:24 UTC (rev 4448)
@@ -1,3 +1,21 @@
+/**
+ *
+ * Magnolia5 test webapp (http://openutils.sourceforge.net/magnolia5-test-webapp)
+ * Copyright(C) ${project.inceptionYear}-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
package info.magnolia.module.development;
import info.magnolia.cms.core.SystemProperty;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 13:52:18
|
Revision: 4447
http://openutils.svn.sourceforge.net/openutils/?rev=4447&view=rev
Author: fgiust
Date: 2013-11-02 13:52:15 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
fix invalid test configuration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.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 2013-11-02 10:06:01 UTC (rev 4446)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-02 13:52:15 UTC (rev 4447)
@@ -59,7 +59,7 @@
* @author cstrappazzon
* @version $Id$
*/
-@RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
public class TagCloudManagerTest extends TestNgRepositoryTestcase
{
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 10:06:01 UTC (rev 4446)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 13:52:15 UTC (rev 4447)
@@ -79,6 +79,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -389,10 +390,15 @@
logger.setLevel(Level.WARN);
}
- InputStream repositoryConfigFileStream = ClasspathResourcesUtil
- .getResource(repositoryConfigFileName)
- .openStream();
+ URL repositoryConfigURL = ClasspathResourcesUtil.getResource(repositoryConfigFileName);
+ if (repositoryConfigURL == null)
+ {
+ throw new IllegalArgumentException("Unable to find repository config file " + repositoryConfigFileName);
+ }
+
+ InputStream repositoryConfigFileStream = repositoryConfigURL.openStream();
+
extractConfigFile("magnolia.repositories.config", repositoryConfigFileStream, "target/repositories.xml");
IOUtils.closeQuietly(repositoryConfigFileStream);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 10:06:04
|
Revision: 4446
http://openutils.svn.sourceforge.net/openutils/?rev=4446&view=rev
Author: fgiust
Date: 2013-11-02 10:06:01 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
tests converted to testng
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.dtd
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.xml
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-11-02 10:05:43 UTC (rev 4445)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-11-02 10:06:01 UTC (rev 4446)
@@ -235,10 +235,16 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.0.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<properties>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-02 10:05:43 UTC (rev 4445)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-02 10:06:01 UTC (rev 4446)
@@ -19,18 +19,18 @@
package net.sourceforge.openutils.mgnltagcloud.manager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
+import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.Path;
-import info.magnolia.cms.util.ClasspathResourcesUtil;
+import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
-import info.magnolia.test.RepositoryTestCase;
+import it.openutils.mgnlutils.test.ModuleConfiguration;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
import java.util.Map;
import java.util.Set;
@@ -40,24 +40,31 @@
import javax.jcr.Session;
import javax.jcr.Value;
+import net.sourceforge.openutils.mgnltagcloud.bean.TagCloud;
import net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions;
import net.sourceforge.openutils.mgnltagcloud.module.TagCloudModule;
import net.sourceforge.openutils.mgnltagcloud.util.JackrabbitUtil;
import org.apache.commons.lang.ArrayUtils;
import org.apache.jackrabbit.value.ValueFactoryImpl;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
/**
* @author cstrappazzon
* @version $Id$
*/
-public class TagCloudManagerTest extends RepositoryTestCase
+@RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
+public class TagCloudManagerTest extends TestNgRepositoryTestcase
{
+ private static final String ObservedManager = null;
+
/**
* Set list of tag values
*/
@@ -115,7 +122,7 @@
Map<String, Integer> tags = TagCloudElFunctions.notcached(RepositoryConstants.WEBSITE, pathList[0], "tags", 2);
log.debug("Time: " + (System.currentTimeMillis() - time));
log.debug("PathMap freq: {}", tags);
- assertEquals(nodesNumber, tags.get("tag1 tag4"));
+ Assert.assertEquals(nodesNumber, tags.get("tag1 tag4"));
}
/**
@@ -128,12 +135,12 @@
Map<String, Integer> tags = TagCloudElFunctions.cached(RepositoryConstants.WEBSITE, pathList[1], "tags", 2);
log.debug("Time: " + (System.currentTimeMillis() - time));
log.debug("tagCloud freq: {}", tags);
- assertEquals(nodesNumber, tags.get("tag2"));
+ Assert.assertEquals(nodesNumber, tags.get("tag2"));
time = System.currentTimeMillis();
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"));
+ Assert.assertEquals(nodesNumber, tags.get("tag1 tag4"));
}
/**
@@ -147,7 +154,7 @@
log.debug("Tags: {}", tags);
log.debug("Ordered Tags: {}", orderedTags);
- assertNotSame(tags.keySet(), orderedTags.keySet());
+ Assert.assertNotSame(tags.keySet(), orderedTags.keySet());
}
/**
@@ -161,9 +168,9 @@
Map<String, Integer> countedTags = TagCloudElFunctions.sortbycount(tags, false);
log.debug("Tags: {}", countedTags);
- assertNotSame(tags, countedTags);
+ Assert.assertNotSame(tags, countedTags);
Set<String> listOrderedTag = countedTags.keySet();
- assertEquals("tag32", listOrderedTag.iterator().next().toString());
+ Assert.assertEquals("tag32", listOrderedTag.iterator().next().toString());
}
/**
@@ -172,7 +179,15 @@
@Test
public void testNamed()
{
- Map<String, Integer> tags = TagCloudElFunctions.named("cloud1");
+ String cloudname = "cloud1";
+ TagCloud tagCloud = Components.getComponent(TagCloudManager.class).getTagCloud(cloudname);
+
+ if (tagCloud == null)
+ {
+ Assert.fail("Tagcloud " + cloudname + " not configured");
+ }
+
+ Map<String, Integer> tags = TagCloudElFunctions.named(cloudname);
log.debug("Tags: {}", tags);
try
@@ -193,13 +208,13 @@
catch (InterruptedException e)
{
log.error("Interrupt exception", e);
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
- tags = TagCloudElFunctions.named("cloud1");
+ tags = TagCloudElFunctions.named(cloudname);
log.debug("Tags: {}", tags);
- assertEquals(true, tags.containsKey("prova"));
+ Assert.assertEquals(true, tags.containsKey("prova"));
}
/**
@@ -215,13 +230,17 @@
log.debug("Properties {}", mapProperties);
- assertEquals(new Integer(5), mapProperties.get("count"));
- assertEquals(tags.get("tag1 tag4"), mapProperties.get("max"));
+ Assert.assertEquals(new Integer(5), mapProperties.get("count"));
+ Assert.assertEquals(tags.get("tag1 tag4"), mapProperties.get("max"));
}
+ @SuppressWarnings("deprecation")
@Override
+ @BeforeClass
public void setUp() throws Exception
{
+ ComponentsTestUtil.setImplementation(TagCloudManager.class, DefaultTagCloudManager.class);
+
super.setUp();
session = MgnlContext.getInstance().getJCRSession(RepositoryConstants.WEBSITE);
@@ -254,10 +273,10 @@
}
session.save();
- Session hmConfig = MgnlContext.getInstance().getJCRSession(RepositoryConstants.CONFIG);
+ Session configsession = MgnlContext.getInstance().getJCRSession(RepositoryConstants.CONFIG);
Node contentTagcloud = NodeUtil.createPath(
session.getNode("/"),
- Path.getValidatedLabel("clouds"),
+ "/modules/tagcloud/clouds",
MgnlNodeType.NT_CONTENT);
Node contentCloud = NodeUtil.createPath(
@@ -271,35 +290,23 @@
contentCloud.setProperty("enabled", ValueFactoryImpl.getInstance().createValue(true));
contentCloud.setProperty("count", ValueFactoryImpl.getInstance().createValue(50));
- hmConfig.save();
+ configsession.save();
- ComponentsTestUtil.setImplementation(TagCloudManager.class, DefaultTagCloudManager.class);
DefaultTagCloudManager manager = (DefaultTagCloudManager) Components.getComponent(TagCloudManager.class);
manager.jackrabbitUtil = new JackrabbitUtil();
manager.onRegister(contentCloud);
+
+ ObservedManager tagCloudManager = (ObservedManager) Components.getComponent(TagCloudManager.class);
+ tagCloudManager.register(ContentUtil.asContent(contentTagcloud.getParent()));
}
@Override
+ @AfterClass
public void tearDown() throws Exception
{
- ComponentsTestUtil.setImplementation(TagCloudManager.class, DefaultTagCloudManager.class);
Components.getComponent(TagCloudManager.class).stopObserving();
super.tearDown();
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected void startRepository() throws Exception
- {
- extractConfigFile(
- "magnolia.indexingConfiguration",
- ClasspathResourcesUtil.getResource("/indexing_configuration.xml").openStream(),
- "target/repositories/magnolia/indexing_configuration.xml");
-
- super.startRepository();
- }
-
}
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.dtd
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.dtd (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.dtd 2013-11-02 10:06:01 UTC (rev 4446)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+ categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name ID #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name ID #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.dtd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.xml 2013-11-02 10:06:01 UTC (rev 4446)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+ <!-- log4j test configuration -->
+ <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L) %m%n" />
+ </layout>
+ </appender>
+ <category name="jdbc">
+ <priority value="WARN" />
+ </category>
+ <category name="it">
+ <priority value="INFO" />
+ </category>
+ <category name="info">
+ <priority value="INFO" />
+ </category>
+ <category name="org">
+ <priority value="WARN" />
+ </category>
+ <category name="com">
+ <priority value="WARN" />
+ </category>
+ <category name="net">
+ <priority value="WARN" />
+ </category>
+ <category name="org.dbunit">
+ <priority value="WARN" />
+ </category>
+ <category name="score">
+ <priority value="INFO" />
+ </category>
+ <category name="it">
+ <priority value="INFO" />
+ </category>
+ <category name="net.sourceforge.openutils.mgnltagcloud">
+ <priority value="DEBUG" />
+ </category>
+ <root>
+ <priority value="ALL" />
+ <appender-ref ref="test-appender" />
+ </root>
+</log4j:configuration>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml 2013-11-02 10:05:43 UTC (rev 4445)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml 2013-11-02 10:06:01 UTC (rev 4446)
@@ -19,7 +19,7 @@
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="indexingConfiguration" value="${rep.home}/indexing_configuration.xml" />
+ <param name="indexingConfiguration" value="/indexing_configuration.xml" />
<param name="path" value="${wsp.home}/index" />
<param name="useCompoundFile" value="true" />
<param name="minMergeDocs" value="100" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 10:05:47
|
Revision: 4445
http://openutils.svn.sourceforge.net/openutils/?rev=4445&view=rev
Author: fgiust
Date: 2013-11-02 10:05:43 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
properly start modules
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 09:10:55 UTC (rev 4444)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 10:05:43 UTC (rev 4445)
@@ -47,6 +47,7 @@
import info.magnolia.init.properties.ModulePropertiesSource;
import info.magnolia.jcr.wrapper.DelegateSessionWrapper;
import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContextImpl;
import info.magnolia.module.ModuleManagementException;
import info.magnolia.module.ModuleManager;
import info.magnolia.module.ModuleManagerImpl;
@@ -490,7 +491,6 @@
Node node = MgnlContext.getJCRSession(RepositoryConstants.CONFIG).getNode(
"/modules/" + modulename + "/config");
module = (ModuleLifecycle) Content2BeanUtil.toBean(ContentUtil.asContent(node), true, moduleClass);
- module.start(null);
}
else
{
@@ -498,6 +498,8 @@
}
Components.getComponent(ModuleRegistry.class).registerModuleInstance(modulename, module);
+ ModuleLifecycleContextImpl lifecycleCtx = new ModuleLifecycleContextImpl();
+ module.start(lifecycleCtx);
return module;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-02 09:10:59
|
Revision: 4444
http://openutils.svn.sourceforge.net/openutils/?rev=4444&view=rev
Author: fgiust
Date: 2013-11-02 09:10:55 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
handles modules without config
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-01 21:49:04 UTC (rev 4443)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-02 09:10:55 UTC (rev 4444)
@@ -64,6 +64,7 @@
import info.magnolia.objectfactory.configuration.InstanceConfiguration;
import info.magnolia.objectfactory.configuration.ProviderConfiguration;
import info.magnolia.repository.DefaultRepositoryManager;
+import info.magnolia.repository.RepositoryConstants;
import info.magnolia.repository.RepositoryManager;
import info.magnolia.test.ComponentsTestUtil;
import info.magnolia.test.FixedModuleDefinitionReader;
@@ -93,7 +94,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.SessionImpl;
@@ -482,12 +482,21 @@
throws Content2BeanException, RepositoryException
{
// register and start module
- Node node = MgnlContext.getJCRSession("config").getNode("/modules/" + modulename + "/config");
- ModuleLifecycle module = (ModuleLifecycle) Content2BeanUtil.toBean(
- ContentUtil.asContent(node),
- true,
- moduleClass);
- module.start(null);
+ String nodemoconfig = "/modules/" + modulename + "/config";
+ ModuleLifecycle module = null;
+
+ if (MgnlContext.getJCRSession(RepositoryConstants.CONFIG).nodeExists(nodemoconfig))
+ {
+ Node node = MgnlContext.getJCRSession(RepositoryConstants.CONFIG).getNode(
+ "/modules/" + modulename + "/config");
+ module = (ModuleLifecycle) Content2BeanUtil.toBean(ContentUtil.asContent(node), true, moduleClass);
+ module.start(null);
+ }
+ else
+ {
+ module = Components.getComponent(moduleClass);
+ }
+
Components.getComponent(ModuleRegistry.class).registerModuleInstance(modulename, module);
return module;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-01 21:49:09
|
Revision: 4443
http://openutils.svn.sourceforge.net/openutils/?rev=4443&view=rev
Author: fgiust
Date: 2013-11-01 21:49:04 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
unit tests nearly working
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-11-01 21:33:37 UTC (rev 4442)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2013-11-01 21:49:04 UTC (rev 4443)
@@ -187,6 +187,12 @@
<version>5.0.10-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltests</artifactId>
+ <version>5.0.10-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-01 21:33:37 UTC (rev 4442)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2013-11-01 21:49:04 UTC (rev 4443)
@@ -29,6 +29,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import info.magnolia.test.ComponentsTestUtil;
import info.magnolia.test.RepositoryTestCase;
import java.util.Map;
@@ -272,6 +273,7 @@
hmConfig.save();
+ ComponentsTestUtil.setImplementation(TagCloudManager.class, DefaultTagCloudManager.class);
DefaultTagCloudManager manager = (DefaultTagCloudManager) Components.getComponent(TagCloudManager.class);
manager.jackrabbitUtil = new JackrabbitUtil();
@@ -281,8 +283,9 @@
@Override
public void tearDown() throws Exception
{
+ ComponentsTestUtil.setImplementation(TagCloudManager.class, DefaultTagCloudManager.class);
+ Components.getComponent(TagCloudManager.class).stopObserving();
super.tearDown();
- Components.getComponent(TagCloudManager.class).stopObserving();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-01 21:33:40
|
Revision: 4442
http://openutils.svn.sourceforge.net/openutils/?rev=4442&view=rev
Author: fgiust
Date: 2013-11-01 21:33:37 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
new task
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java
Added: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java 2013-11-01 21:33:37 UTC (rev 4442)
@@ -0,0 +1,110 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Move children of a node and deletes it(if existing).
+ * @author fgiust
+ * @version $Id$
+ */
+public class MoveSubnodesAndDeleteTask extends AbstractRepositoryTask
+{
+
+ private String workspaceName;
+
+ private String from;
+
+ private String warning;
+
+ private Logger log = LoggerFactory.getLogger(MoveSubnodesAndDeleteTask.class);
+
+ private String to;
+
+ /**
+ * @param workspaceName workspace (for example "config")
+ * @param from source node path
+ * @param from destination node path
+ * @param warning optional warning message which will be shown if the node to move actually exists
+ */
+ public MoveSubnodesAndDeleteTask(String workspaceName, String from, String to, String warning)
+ {
+ super("Moving configuration from " + from + " to " + to, "Moving configuration from " + from + " to " + to);
+ this.workspaceName = workspaceName;
+ this.from = from;
+ this.to = to;
+ this.warning = warning;
+ }
+
+ @Override
+ protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+ {
+
+ Session session = installContext.getJCRSession(workspaceName);
+
+ if (NodeUtilsExt.exists(session, from))
+ {
+ if (warning != null)
+ {
+ installContext.warn(warning);
+ }
+
+ Node fromnode = session.getNode(from);
+
+ Node toNode = null;
+
+ if (!NodeUtilsExt.exists(session, to))
+ {
+ toNode = NodeUtil.createPath(session.getRootNode(), to, MgnlNodeType.NT_CONTENT);
+ }
+ else
+ {
+ toNode = session.getNode(to);
+ }
+
+ Iterable<Node> nodes = NodeUtil.getNodes(fromnode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+ for (Node node : nodes)
+ {
+ if (!toNode.hasNode(node.getName()))
+ {
+ node.getSession().move(node.getPath(), toNode.getPath() + "/" + node.getName());
+ }
+ }
+
+ NodeUtilsExt.deleteIfExisting(session, from);
+ }
+ }
+
+}
Property changes on: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-11-01 21:33:34
|
Revision: 4441
http://openutils.svn.sourceforge.net/openutils/?rev=4441&view=rev
Author: fgiust
Date: 2013-11-01 21:33:31 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
fix annotation default
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-01 21:24:42 UTC (rev 4440)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2013-11-01 21:33:31 UTC (rev 4441)
@@ -458,7 +458,7 @@
{
for (String string : paths)
{
- if (StringUtils.contains(name, string))
+ if (StringUtils.contains(name, string) && StringUtils.endsWithIgnoreCase(name, ".xml"))
{
return true;
}
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java 2013-11-01 21:24:42 UTC (rev 4440)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java 2013-11-01 21:33:31 UTC (rev 4441)
@@ -56,7 +56,7 @@
/**
* A list of directory (classpath paths) to bootstrap.
*/
- String[] bootstrapDirectory() default "";
+ String[] bootstrapDirectory() default {};
/**
* magnolia.properties location. Defaults to "/test-magnolia.properties".
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
