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-09-20 15:55:02
|
Revision: 4340
http://openutils.svn.sourceforge.net/openutils/?rev=4340&view=rev
Author: fgiust
Date: 2013-09-20 15:54:59 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:54:48 UTC (rev 4339)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:54:59 UTC (rev 4340)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.1</version>
+ <version>4.5.2-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 15:54:51
|
Revision: 4339
http://openutils.svn.sourceforge.net/openutils/?rev=4339&view=rev
Author: fgiust
Date: 2013-09-20 15:54:48 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcontextmenu-4.5.1
Added Paths:
-----------
tags/openutils-mgnlcontextmenu-4.5.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 15:54:42
|
Revision: 4338
http://openutils.svn.sourceforge.net/openutils/?rev=4338&view=rev
Author: fgiust
Date: 2013-09-20 15:54:39 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcontextmenu-4.5.1
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:53:56 UTC (rev 4337)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:54:39 UTC (rev 4338)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.1-SNAPSHOT</version>
+ <version>4.5.1</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 15:53:59
|
Revision: 4337
http://openutils.svn.sourceforge.net/openutils/?rev=4337&view=rev
Author: fgiust
Date: 2013-09-20 15:53:56 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
remove tag
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:36:43 UTC (rev 4336)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:53:56 UTC (rev 4337)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.1</version>
+ <version>4.5.1-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
<plugins>
@@ -171,4 +171,4 @@
<properties>
<magnolia.version>4.5.11</magnolia.version>
</properties>
-</project>
\ No newline at end of file
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-20 15:36:46
|
Revision: 4336
http://openutils.svn.sourceforge.net/openutils/?rev=4336&view=rev
Author: lucaboati
Date: 2013-09-20 15:36:43 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcontextmenu-4.5.1
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 13:45:00 UTC (rev 4335)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-20 15:36:43 UTC (rev 4336)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.1-SNAPSHOT</version>
+ <version>4.5.1</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.1</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 13:45:03
|
Revision: 4335
http://openutils.svn.sourceforge.net/openutils/?rev=4335&view=rev
Author: fgiust
Date: 2013-09-20 13:45:00 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
upgrade versions in poms
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-09-20 13:40:10 UTC (rev 4334)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-09-20 13:45:00 UTC (rev 4335)
@@ -91,6 +91,11 @@
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-categorization</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-standard-templating-kit</artifactId>
<version>${stk.version}</version>
</dependency>
@@ -196,12 +201,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlrules</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.5.1-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-09-20 13:40:14
|
Revision: 4334
http://openutils.svn.sourceforge.net/openutils/?rev=4334&view=rev
Author: fgiust
Date: 2013-09-20 13:40:10 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
empty assembly
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/assembly/
magnoliamodules/trunk/magnolia-test-webapp/src/main/assembly/assembly-bundle.xml
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/assembly/assembly-bundle.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/assembly/assembly-bundle.xml 2013-09-20 13:40:10 UTC (rev 4334)
@@ -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/magnolia-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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 13:40:08
|
Revision: 4333
http://openutils.svn.sourceforge.net/openutils/?rev=4333&view=rev
Author: fgiust
Date: 2013-09-20 13:40:04 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
ignores
Property Changed:
----------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-09-20 13:39:11 UTC (rev 4332)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-09-20 13:40:04 UTC (rev 4333)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
___________________________________________________________________
Modified: svn:ignore
## -7,3 +7,4 ##
samples-stripes
samples-struts11
samples-rules
+samples-tagcloud
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 13:39:27
|
Revision: 4332
http://openutils.svn.sourceforge.net/openutils/?rev=4332&view=rev
Author: fgiust
Date: 2013-09-20 13:39:11 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
fix jsp samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-20 12:38:39 UTC (rev 4331)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-20 13:39:11 UTC (rev 4332)
@@ -78,6 +78,11 @@
*/
public static String entryValue(Node node, String name)
{
+ if (node == null)
+ {
+ return null;
+ }
+
ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-20 12:38:39 UTC (rev 4331)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-20 13:39:11 UTC (rev 4332)
@@ -9,7 +9,7 @@
<pre>
<![CDATA[
<contextmenu:element name="firstname" menu="simpleForm">First Name:</contextmenu:element>
-<c:set var="help" value="${'$'}{contextmenu:entryValue(content.JCRNode, 'firstname.help')}" />]]>
+<c:set var="help" value="${'$'}{contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />]]>
</pre>
<br />
<div class="testcontent clearfix">
@@ -21,7 +21,7 @@
</label>
<div class="col-lg-4">
<input name="firstname" id="firstname" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'firstname.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -35,7 +35,7 @@
</label>
<div class="col-lg-4">
<input name="lastname" id="lastname" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'lastname.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -49,7 +49,7 @@
</label>
<div class="col-lg-4">
<input name="email" id="email" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'email.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -72,7 +72,7 @@
<option value="1942">1942</option>
<option value="1999">1999</option>
</select>
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'year.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -86,7 +86,7 @@
</label>
<div class="col-lg-4">
<input name="username" id="username" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'username.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -100,7 +100,7 @@
</label>
<div class="col-lg-4">
<input name="password" id="password" type="password" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'password.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-09-20 12:38:39 UTC (rev 4331)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-09-20 13:39:11 UTC (rev 4332)
@@ -33,7 +33,7 @@
</label>
<div class="controls">
<input name="field1" id="field1" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'field1.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field1.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -49,7 +49,7 @@
</label>
<div class="controls">
<input name="field2" id="field2" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'field2.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field2.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-20 12:38:43
|
Revision: 4331
http://openutils.svn.sourceforge.net/openutils/?rev=4331&view=rev
Author: fgiust
Date: 2013-09-20 12:38:39 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
less Content (and more broken)
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
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/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
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/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.dam;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.dam;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.grid;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.context.MgnlContext;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -112,7 +113,7 @@
{
try
{
- Collection<Content> referenceOptions = MgnlContext
+ Collection<Node> referenceOptions = MgnlContext
.getHierarchyManager("config")
.getContent(reference)
.getChildren();
@@ -126,7 +127,7 @@
addOptions(opt);
}
- for (Content content : referenceOptions)
+ for (Node content : referenceOptions)
{
opt = new Option();
opt.setLabel(content.getNodeData("label").getString());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.commands;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.exchange.ExchangeException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -114,9 +114,7 @@
{
Node node = content.getJCRNode();
-
-
-
+
for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
{
Node typeNode = iter.next();
@@ -147,7 +145,7 @@
}
catch (Throwable e)
{
- log.error("Error getting media type configuration for {}", typeNode.getHandle(), e);
+ log.error("Error getting media type configuration for {}", NodeUtil.getPathIfPossible(typeNode), e);
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.crop;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
@@ -28,6 +28,7 @@
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -73,7 +74,7 @@
try
{
- final Content node = hm.getContent(handle);
+ final Node node = hm.getContent(handle);
if ("delete".equals(command))
{
NodeData nd = node.getNodeData(id);
@@ -95,7 +96,7 @@
HierarchyManager hm = MgnlContext.getHierarchyManager(systemRepository);
try
{
- Content systemNode = hm.getContent(node.getHandle());
+ Node systemNode = hm.getContent(node.getHandle());
NodeDataUtil.getOrCreateAndSet(systemNode, id, new StringBuffer()
.append(zoom)
.append("|")
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
+
import info.magnolia.cms.core.Content;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.context.MgnlContext;
import info.magnolia.freemarker.FreemarkerUtil;
@@ -27,6 +27,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -214,15 +215,15 @@
return metas;
}
- public Iterator<Content> getMediaContentList()
+ public Iterator<Node> getMediaContentList()
{
- return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, Content>()
+ return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, Node>()
{
/**
* {@inheritDoc}
*/
- public Content apply(AdvancedResultItem from)
+ public Node apply(AdvancedResultItem from)
{
try
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,14 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.MetaData;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
+
/**
* Store media info for rendering in {@link MediaFolderViewPage}
* @author molaschi
@@ -51,7 +53,7 @@
private String dialog;
- private Content content;
+ private Node content;
private MetaData metaData;
@@ -203,7 +205,7 @@
* Returns the content.
* @return the content
*/
- public Content getContent()
+ public Node getContent()
{
return content;
}
@@ -212,7 +214,7 @@
* Sets the content.
* @param content the content to set
*/
- public void setContent(Content content)
+ public void setContent(Node content)
{
this.content = content;
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.config.URI2RepositoryManager;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.util.NodeDataUtil;
@@ -29,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -48,7 +48,7 @@
* @author dschivo
* @version $Id$
*/
-public class MediaBeanBuilder implements Function<Content, MediaBean>
+public class MediaBeanBuilder implements Function<Node, MediaBean>
{
/**
@@ -59,7 +59,7 @@
/**
* {@inheritDoc}
*/
- public MediaBean apply(Content media)
+ public MediaBean apply(Node media)
{
String mediatype = media.getNodeData("type").getString();
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
@@ -39,6 +38,7 @@
import java.util.List;
import java.util.zip.ZipFile;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -116,7 +116,7 @@
HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Content media = mgr.getContentByUUID(actMedia);
+ Node media = mgr.getContentByUUID(actMedia);
openPath = media.getParent().getHandle();
actMediaHandle = media.getHandle();
}
@@ -127,13 +127,13 @@
}
if (!StringUtils.isEmpty(playlistHandle))
{
- Content playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
+ Node playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
try
{
if (playlistContent.hasContent("search"))
{
List<String> params = new ArrayList<String>();
- for (Content content : playlistContent.getContent("search").getChildren())
+ for (Node content : playlistContent.getContent("search").getChildren())
{
String paramName = NodeDataUtil.getString(content, "name");
String paramValue = NodeDataUtil.getString(content, "value");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.context.MgnlContext;
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -95,9 +96,9 @@
HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
- Collection<Content> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
+ Collection<Node> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
List<String> tmpPaths = new ArrayList<String>();
- for (Content c : contents)
+ for (Node c : contents)
{
tmpPaths.add(c.getName());
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
@@ -71,7 +72,7 @@
try
{
- final Content mediatypenode = hm.getContent(nodePath);
+ final Node mediatypenode = hm.getContent(nodePath);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (!StringUtils.contains(extensions, this.extension))
{
@@ -85,7 +86,7 @@
try
{
- final Content mediatypenode = hm.getContent(control);
+ final Node mediatypenode = hm.getContent(control);
String extensions = mediatypenode.getNodeData("extensions").getString();
if (!StringUtils.contains(extensions, this.extension))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.exchange.ActivationManager;
import info.magnolia.cms.exchange.ActivationManagerFactory;
@@ -35,6 +35,7 @@
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -59,7 +60,7 @@
// check for the sigleinstance flag directly in jcr, the module is not started yet
boolean singleinstance = false;
- Content moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
+ Node moduleConfigNode = ContentUtil.getContent(RepositoryConstants.CONFIG, "/modules/media/config");
if (moduleConfigNode != null)
{
singleinstance = moduleConfigNode.getNodeData("singleinstance").getBoolean();
@@ -95,13 +96,13 @@
{
if (!subscriber.isSubscribed("/", repository))
{
- Content subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
+ Node subscriptionsNode = ContentUtil.getContent(RepositoryConstants.CONFIG, sManager.getConfigPath()
+ "/"
+ subscriber.getName()
+ "/subscriptions");
try
{
- Content newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
+ Node newSubscription = subscriptionsNode.createContent(repository, ItemType.CONTENTNODE);
newSubscription.createNodeData("toURI").setValue("/");
newSubscription.createNodeData("repository").setValue(repository);
newSubscription.createNodeData("fromURI").setValue("/");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.module.InstallContext;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.search.Query;
@@ -32,6 +31,7 @@
import java.util.Collection;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -66,8 +66,8 @@
{
Query query = mgr.createQuery("//*", Query.XPATH);
QueryResult result = query.execute();
- Collection<Content> medias = result.getContent(MediaConfigurationManager.MEDIA.getSystemName());
- for (Content node : medias)
+ Collection<Node> medias = result.getContent(MediaConfigurationManager.MEDIA.getSystemName());
+ for (Node node : medias)
{
if (node.hasNodeData("thumbnail"))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.gui.control.Tree;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.gui.control.Tree;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.gui.control.Hidden;
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-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -27,6 +27,8 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -148,15 +150,15 @@
String name = p != -1 ? filename.substring(p + 1) : filename;
// lowercase at saving for case insensitive sorting
name = StringUtils.lowerCase(name);
- if (!StringUtils.equals(name, NodeDataUtil.getString(media, METADATA_NAME)))
+ if (!StringUtils.equals(name, PropertyUtil.getString(media, METADATA_NAME)))
{
NodeDataUtil.getOrCreateAndSet(media, METADATA_NAME, name);
media.save();
}
- if (media.hasContent("resolutions"))
+ if (media.hasNode("resolutions"))
{
- Collection<NodeData> nodedatas = media.getChildByName("resolutions").getNodeDataCollection();
+ Collection<NodeData> nodedatas = media.getNode("resolutions").getNodeDataCollection();
for (NodeData nd : nodedatas)
{
nd.delete();
@@ -241,7 +243,7 @@
// should never happen
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/"
+ ORGINAL_NODEDATA_NAME
+ "/"
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -22,6 +22,7 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import java.awt.image.BufferedImage;
import java.io.InputStream;
@@ -62,7 +63,7 @@
return StringUtils.EMPTY;
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/resolutions/thumbnail/"
+ media.getName()
+ "."
@@ -80,7 +81,7 @@
return StringUtils.EMPTY;
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/resolutions/preview/"
+ media.getName()
+ "."
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,12 +20,12 @@
package net.sourceforge.openutils.mgnlmedia.media.uri;
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.link.Link;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -116,10 +116,10 @@
if (p != -1)
{
String mediaPath = handle.substring(0, p);
- Content mediaNode = ContentUtil.getContent(MediaModule.REPO, mediaPath);
+ Node mediaNode = ContentUtil.getContent(MediaModule.REPO, mediaPath);
if (mediaNode != null)
{
- Content resolutionsNode = ContentUtil.getContent(mediaNode, resolutionsName);
+ Node resolutionsNode = ContentUtil.getContent(mediaNode, resolutionsName);
String ndName = StringUtils.substringBefore(handle.substring(p + search.length()), "/");
if (resolutionsNode != null && !StringUtils.isEmpty(ndName))
{
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-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -20,7 +20,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.context.Context;
@@ -497,7 +497,7 @@
* @throws RepositoryException exception in jcr operations
* @throws IOException exception converting image to jpg
*/
- public static NodeData saveResolution(BufferedImage image, Content saveTo, String extension, float quality,
+ public static NodeData saveResolution(BufferedImage image, Node saveTo, String extension, float quality,
boolean forceProgressive) throws RepositoryException, IOException
{
return saveResolution(image, saveTo, null, extension, quality, forceProgressive);
@@ -514,12 +514,12 @@
* @throws RepositoryException exception in jcr operations
* @throws IOException exception converting image to jpg
*/
- public static NodeData saveResolution(final BufferedImage image, final Content saveTo, final String name,
+ public static Node saveResolution(final BufferedImage image, final Node saveTo, final String name,
final String extension, final float quality, final boolean forceProgressive) throws RepositoryException,
IOException
{
- Content resolutions = getResolutionsNode(saveTo);
+ Node resolutions = getResolutionsNode(saveTo);
if (resolutions == null)
{
resolutions = saveTo.createContent("resolutions", MediaConfigurationManager.RESOLUTIONS);
@@ -534,9 +534,9 @@
}
final String resolutionNodeName = getResolutionPath(resolution);
- final Content resolutionsFinal = resolutions;
+ final Node resolutionsFinal = resolutions;
- Node resolutionsJcrNode = resolutions.getJCRNode();
+ Node resolutionsJcrNode = resolutions;
Object ret;
try
@@ -830,7 +830,7 @@
* @param resolutionTarget target resolution
* @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
*/
- public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget)
+ public static boolean checkOrCreateResolution(final Node media, final String resolutionTarget)
{
return checkOrCreateResolution(media, resolutionTarget, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
@@ -843,15 +843,15 @@
* @param nodeDataName nodedata where the image to resize is stored
* @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
*/
- public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget,
+ public static boolean checkOrCreateResolution(final Node media, final String resolutionTarget,
String nodeDataName)
{
return checkOrCreateResolution(media, resolutionTarget, nodeDataName, false);
}
- private static boolean checkResolution(final Content media, final String resolutionTarget, final boolean lazy)
+ private static boolean checkResolution(final Node media, final String resolutionTarget, final boolean lazy)
{
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
String resolution = resolutionTarget;
@@ -886,7 +886,7 @@
return false;
}
- public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget,
+ public static boolean checkOrCreateResolution(final Node media, final String resolutionTarget,
String nodeDataName, final boolean lazy)
{
if (checkResolution(media, resolutionTarget, lazy))
@@ -953,7 +953,7 @@
resolutioNodeName = resolutionTarget;
}
- Content node;
+ Node node;
try
{
node = hm.getContent(media.getHandle());
@@ -1126,15 +1126,15 @@
* @param media
* @return
*/
- protected static Content getResolutionsNode(final Content media)
+ protected static Node getResolutionsNode(final Node media)
{
- Content resolutions = null;
+ Node resolutions = null;
try
{
- if (media.hasContent("resolutions"))
+ if (media.hasNode("resolutions"))
{
- resolutions = media.getContent("resolutions");
+ resolutions = media.getNode("resolutions");
}
}
catch (RepositoryException e)
@@ -1231,11 +1231,11 @@
* @param resolution resolution
* @return file extension for a resolution stored in a media node
*/
- public static String getExtension(Content media, String resolution)
+ public static String getExtension(Node media, String resolution)
{
try
{
- Content resolutions = media.getContent("resolutions");
+ Node resolutions = media.getNode("resolutions");
NodeData res = resolutions.getNodeData(resolution);
return res.getAttribute(FileProperties.PROPERTY_EXTENSION);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.security.AccessDeniedException;
@@ -33,6 +33,7 @@
import java.io.InputStream;
import java.util.Calendar;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -70,7 +71,7 @@
* @throws RepositoryException exception working on media repository
* @throws IOException exception working with file stream
*/
- public static Content loadExternalVideo(String videourl, String parent, String filename, boolean overwrite)
+ public static Node loadExternalVideo(String videourl, String parent, String filename, boolean overwrite)
throws RepositoryException, IOException
{
log.debug("loading external video {}/{} with url {}", new Object[]{parent, filename, videourl });
@@ -79,7 +80,7 @@
String cleanFilename = Path.getValidatedLabel(videourl);
- Content media = createMediaNode(mtc, parent, cleanFilename, overwrite);
+ Node media = createMediaNode(mtc, parent, cleanFilename, overwrite);
media.setNodeData("videoUrl", videourl);
mtc.getHandler().onPostSave(media);
@@ -98,7 +99,7 @@
* @throws RepositoryException exception working on media repository
* @throws IOException exception working with file stream
*/
- public static Content loadEntry(InputStream inputStream, String parent, String filename, boolean overwrite)
+ public static Node loadEntry(InputStream inputStream, String parent, String filename, boolean overwrite)
throws RepositoryException, IOException
{
@@ -110,7 +111,7 @@
if (mtc != null)
{
- Content media = createMediaNode(mtc, parent, cleanFilename, overwrite);
+ Node media = createMediaNode(mtc, parent, cleanFilename, overwrite);
File f = File.createTempFile("entry", "." + extension);
FileOutputStream fTemp = new FileOutputStream(f);
@@ -137,18 +138,18 @@
* @throws RepositoryException
* @throws AccessDeniedException
*/
- private static Content createMediaNode(MediaTypeConfiguration mtc, String parent, String filename, boolean overwrite)
+ private static Node createMediaNode(MediaTypeConfiguration mtc, String parent, String filename, boolean overwrite)
throws RepositoryException, AccessDeniedException
{
HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
- Content parentNode = getOrCreateFullPath(mgr, parent);
+ Node parentNode = getOrCreateFullPath(mgr, parent);
String mediaName = Path.getValidatedLabel(filename);
if (overwrite)
{
- Content existing = parentNode.getChildByName(mediaName);
+ Node existing = parentNode.getChildByName(mediaName);
if (existing != null)
{
existing.delete();
@@ -156,7 +157,7 @@
}
}
- Content media = mgr.createContent(
+ Node media = mgr.createContent(
parent,
Path.getUniqueLabel(parentNode, mediaName),
MediaConfigurationManager.MEDIA.getSystemName());
@@ -184,7 +185,7 @@
* @throws RepositoryException
* @throws AccessDeniedException
*/
- private static void setNodedataOnlyIfNotExisting(Content media, String key, Object value)
+ private static void setNodedataOnlyIfNotExisting(Node media, String key, Object value)
throws RepositoryException, AccessDeniedException
{
if (media.hasNodeData(key))
@@ -201,10 +202,10 @@
* @return content to required path
* @throws RepositoryException exception getting or creating path
*/
- public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+ public static Node getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
{
String[] contentNodeNames = path.split("/");
- Content currContent = mgr.getRoot();
+ Node currContent = mgr.getRoot();
for (String contentNodeName : contentNodeNames)
{
if (StringUtils.isNotEmpty(contentNodeName))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
@@ -28,6 +29,7 @@
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +81,7 @@
protected boolean onPreSave(SaveHandler control)
{
HierarchyManager hm = MgnlContext.getHierarchyManager(PlaylistConstants.REPO);
- Content c = null;
+ Node c = null;
try
{
c = hm.getContent(control.getPath());
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.gui.dialog.Dialog;
import info.magnolia.cms.gui.misc.Sources;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,12 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.util.NodeDataUtil;
import java.io.PrintWriter;
+import javax.jcr.Node;
+
/**
* @author dschivo
* @version $Id$
@@ -35,7 +37,7 @@
/**
* {@inheritDoc}
*/
- public void addMediaAttributes(Content media, PrintWriter writer)
+ public void addMediaAttributes(Node media, PrintWriter writer)
{
writer.println("<media:type>" + NodeDataUtil.getString(media, "type") + "</media:type>");
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -180,7 +180,7 @@
{
playlist = new PlaylistBean();
- playlist.setUuid(node.getUUID());
+ playlist.setUuid(node.getIdentifier());
playlist.setHandle(NodeUtil.getPathIfPossible(node));
playlist.setTitle(NodeDataUtil.getString(node, "title"));
playlist.setDescription(NodeDataUtil.getString(node, "description"));
@@ -218,7 +218,7 @@
try
{
- playlist.setSearchBased(node.hasContent("search"));
+ playlist.setSearchBased(node.hasNode("search"));
}
catch (RepositoryException e)
{
@@ -247,7 +247,7 @@
{
MetaDataUtil.getMetaData(node).setActivated();
}
- node.save();
+ node.getSession().save();
success = true;
}
catch (RepositoryException e)
@@ -271,7 +271,7 @@
{
MetaDataUtil.getMetaData(node).setActivated();
}
- node.save();
+ node.getSession().save();
success = true;
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.gui.control.Tree;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.playlist.tree;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.module.admininterface.AdminTreeMVCHandler;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.repotests;
-import info.magnolia.cms.core.Content;
+
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
@@ -28,6 +28,8 @@
import java.io.InputStream;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
@@ -62,7 +64,7 @@
hm.save();
InputStream is = getClass().getResourceAsStream("/images/openmind.ico");
- Content entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
+ Node entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
IOUtils.closeQuietly(is);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2013-09-19 14:32:06 UTC (rev 4330)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2013-09-20 12:38:39 UTC (rev 4331)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
+
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4330
http://openutils.svn.sourceforge.net/openutils/?rev=4330&view=rev
Author: fgiust
Date: 2013-09-19 14:32:06 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java 2013-09-19 14:31:39 UTC (rev 4329)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java 2013-09-19 14:32:06 UTC (rev 4330)
@@ -20,7 +20,9 @@
package net.sourceforge.openutils.mgnlmedia.media.virtualurimapping;
import info.magnolia.cms.beans.config.VirtualURIMapping;
-import info.magnolia.cms.core.Content;
+
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
import org.apache.commons.lang.StringUtils;
@@ -43,7 +45,7 @@
if (uri.startsWith(PREFIX_MAPPING))
{
String uuid = StringUtils.substringAfter(uri, PREFIX_MAPPING);
- Content media = MediaEl.node(uuid);
+ Node media = MediaEl.node(uuid);
if (media != null)
{
MappingResult mr = new MappingResult();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-19 14:31:43
|
Revision: 4329
http://openutils.svn.sourceforge.net/openutils/?rev=4329&view=rev
Author: fgiust
Date: 2013-09-19 14:31:39 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
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/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -110,11 +110,16 @@
*/
@Override
@SuppressWarnings("unchecked")
- protected void onRegister(Content node)
+ protected void onRegister(Content content)
{
+
+ Node node = content.getJCRNode();
+
+
+
for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
{
- Content typeNode = (Content) iter.next();
+ Node typeNode = iter.next();
if (!NodeDataUtil.getBoolean(typeNode, "enabled", true))
{
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-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,11 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
-import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.security.Permission;
@@ -32,7 +30,12 @@
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
+import info.magnolia.init.MagnoliaConfigurationProperties;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
@@ -45,6 +48,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -61,6 +65,7 @@
import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Iterators;
+import com.sun.xml.internal.ws.util.MetadataUtil;
/**
@@ -184,7 +189,7 @@
sorting = getDefaultSorting().name();
}
// for activation status handling
- develop = SystemProperty.getBooleanProperty("magnolia.develop");
+ develop = Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop");
}
/**
@@ -216,7 +221,7 @@
{
return null;
}
- Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+ Node folder = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, path);
if (folder == null)
{
return null;
@@ -278,7 +283,7 @@
{
// casts Iterator<AdvancedResultItem> to Iterator<Content>
- Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class);
+ Iterator<Node> contentIterator = Iterators.filter(searchResult.getItems(), Node.class);
medias = Iterators.transform(contentIterator, new MediaBeanBuilder());
pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 10, "page");
}
@@ -374,7 +379,7 @@
* @throws ExchangeException publication problem
* @throws RepositoryException repository exception
*/
- public Content copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
+ public Node copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
RepositoryException
{
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
@@ -412,11 +417,11 @@
// copy
hm.copyTo(source, goTo);
}
- Content newContent = hm.getContent(destination);
+ Node newContent = hm.getNode(destination);
try
{
- newContent.updateMetaData();
- newContent.getMetaData().setUnActivated();
+ MetaDataUtil.updateMetaData(newContent);
+ MetaDataUtil.getMetaData(newContent).setUnActivated();
}
catch (Exception e)
{
@@ -499,19 +504,12 @@
public String download()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
+ Node media = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, path);
- Content media;
- try
+ if (media == null)
{
- media = hm.getContent(path);
- }
- catch (RepositoryException e)
- {
- log.error("Error downloading media " + path, e);
return null;
}
-
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(media);
String url = mtc.getHandler().getUrl(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,11 +19,12 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.delta.SetupModuleRepositoriesTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.BootstrapMissingNodesTask;
import it.openutils.mgnltasks.ChangeExistingPropertyTask;
@@ -79,7 +80,8 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.bootstrap.samples"))
{
tasks.add(new SamplesExtractionTask());
}
@@ -254,7 +256,7 @@
{
try
{
- return ModuleRegistry.Factory.getInstance().getDefinition(module) != null;
+ return Components.getComponent(ModuleRegistry.class).getDefinition(module) != null;
}
catch (IllegalArgumentException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -30,7 +30,10 @@
import javax.jcr.RepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Update configuration for media types.
* @author fgiust
@@ -40,6 +43,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(MoveHandlerNodedataToNode.class);
+
+ /**
* Update mediatype configuration
*/
public MoveHandlerNodedataToNode()
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -23,6 +23,7 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.awt.image.BufferedImage;
@@ -103,7 +104,7 @@
catch (Throwable e)
{
log.warn("Unable to generate a preview for {} due to a {}: {}", new Object[]{
- media.getHandle(),
+ NodeUtil.getPathIfPossible(media),
e.getClass().getName(),
e.getMessage() });
}
@@ -164,12 +165,12 @@
}
else
{
- log.error("Error creating preview for " + media.getHandle(), e);
+ log.error("Error creating preview for " + NodeUtil.getPathIfPossible(media), e);
}
}
catch (Throwable e)
{
- log.error("Error creating preview for " + media.getHandle(), e);
+ log.error("Error creating preview for " + NodeUtil.getPathIfPossible(media), e);
}
finally
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,8 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
+import info.magnolia.jcr.util.NodeUtil;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -43,7 +44,7 @@
/**
* {@inheritDoc}
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Node media)
{
if (hasPreview(media))
@@ -53,7 +54,7 @@
return "";
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/resolutions/thumbnail/"
+ media.getName()
+ "."
@@ -66,7 +67,7 @@
public abstract String getReplacementThumbnail();
- protected boolean hasPreview(Content media)
+ protected boolean hasPreview(Node media)
{
if (media != null)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,11 +19,11 @@
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
-import info.magnolia.cms.core.Content;
-
import java.io.PrintWriter;
+import javax.jcr.Node;
+
/**
* @author dschivo
* @version $Id$
@@ -35,6 +35,6 @@
* @param media
* @param writer
*/
- void addMediaAttributes(Content media, PrintWriter writer);
+ void addMediaAttributes(Node media, PrintWriter writer);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -18,14 +18,14 @@
*/
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
+
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import java.io.IOException;
import java.io.PrintWriter;
@@ -92,7 +92,7 @@
private boolean xml;
- private List<Content> mediaContentList;
+ private List<Node> mediaContentList;
private List<MediaBean> mediaBeans;
@@ -175,18 +175,18 @@
{
if (StringUtils.isNotBlank(path))
{
- Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
+ Node node = NodeUtilsExt.getNodeByIdOrPath(PlaylistConstants.REPO, path);
if (node != null)
{
playlist = new PlaylistBean();
playlist.setUuid(node.getUUID());
- playlist.setHandle(node.getHandle());
+ playlist.setHandle(NodeUtil.getPathIfPossible(node));
playlist.setTitle(NodeDataUtil.getString(node, "title"));
playlist.setDescription(NodeDataUtil.getString(node, "description"));
List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
- for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node.getJCRNode()); iterator
+ for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node); iterator
.hasNext();)
{
MediaNodeAndEntryPath item = iterator.next();
@@ -236,7 +236,7 @@
public String save()
{
success = false;
- Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
+ Node node = NodeUtilsExt.getNodeByIdOrPath(PlaylistConstants.REPO, path);
if (node != null)
{
try
@@ -245,7 +245,7 @@
NodeDataUtil.getOrCreateAndSet(node, "description", description);
if (MediaEl.module().isSingleinstance())
{
- node.getMetaData().setActivated();
+ MetaDataUtil.getMetaData(node).setActivated();
}
node.save();
success = true;
@@ -260,7 +260,7 @@
public String saveMedia()
{
success = false;
- Content node = ContentUtil.getContent(MediaModule.REPO, mediaHandle);
+ Node node = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, mediaHandle);
if (node != null)
{
try
@@ -269,7 +269,7 @@
NodeDataUtil.getOrCreateAndSet(node, "description", description);
if (MediaEl.module().isSingleinstance())
{
- node.getMetaData().setActivated();
+ MetaDataUtil.getMetaData(node).setActivated();
}
node.save();
success = true;
@@ -292,13 +292,13 @@
else
{
// Set mediaContent
- mediaContentList = new ArrayList<Content>();
+ mediaContentList = new ArrayList<Node>();
for (PlaylistEntryBean plb : this.getPlaylist().getEntries())
{
+
try
{
- mediaContentList.add(MgnlContext.getHierarchyManager(MediaModule.REPO).getContentByUUID(
- plb.getMedia()));
+ mediaContentList.add(NodeUtil.getNodeByIdentifier(MediaModule.REPO, plb.getMedia()));
}
catch (RepositoryException e)
{
@@ -326,12 +326,12 @@
public String mediaFolder()
{
- Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+ Node folder = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, path);
if (folder != null)
{
- Collection<Content> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
+ Collection<Node> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
mediaBeans = new ArrayList<MediaBean>(nodes.size());
- for (Content node : nodes)
+ for (Node node : nodes)
{
MediaBean bean = new MediaBeanBuilder().apply(node);
mediaBeans.add(bean);
@@ -362,7 +362,7 @@
* Returns the mediaContentList.
* @return the mediaContentList
*/
- public List<Content> getMediaContentList()
+ public List<Node> getMediaContentList()
{
return mediaContentList;
}
@@ -371,7 +371,7 @@
* Sets the mediaContentList.
* @param mediaContentList the mediaContentList to set
*/
- public void setMediaContentList(List<Content> mediaContentList)
+ public void setMediaContentList(List<Node> mediaContentList)
{
this.mediaContentList = mediaContentList;
}
@@ -412,9 +412,9 @@
return metas;
}
- public void writePlaylistTrackExtension(Content media, PrintWriter writer)
+ public void writePlaylistTrackExtension(Node media, PrintWriter writer)
{
- MediaModule module = (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
+ MediaModule module = (MediaModule) Components.getComponent(ModuleRegistry.class).getModuleInstance(MediaModule.NAME);
for (Object item : module.getPlaylistTrackExtensionContributors())
{
PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,9 +19,15 @@
package it.openutils.mgnlutils.api;
+import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import java.util.regex.Pattern;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -36,6 +42,9 @@
public class NodeUtilsExt
{
+ private static Pattern UUID_PATTERN = Pattern
+ .compile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
+
public static boolean exists(Session session, String absolutepath)
{
try
@@ -120,4 +129,52 @@
throw new RuntimeRepositoryException(e);
}
}
+
+ public static Node getNodeByIdOrPath(String workspace, String uuidOrPath)
+ {
+ if (uuidOrPath == null)
+ {
+ return null;
+ }
+
+ if (isUUID(uuidOrPath))
+ {
+ try
+ {
+ return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+ }
+ catch (ItemNotFoundException e)
+ {
+ // ignore
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ else
+ {
+ try
+ {
+ return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ return null;
+ }
+
+ public static boolean isUUID(String string)
+ {
+ // 97ed692a-31a9-4670-9c36-4d8ee8f6128d
+ if (StringUtils.length(string) != 36)
+ {
+ return false;
+ }
+
+ return UUID_PATTERN.matcher(string).find();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-19 09:45:45
|
Revision: 4328
http://openutils.svn.sourceforge.net/openutils/?rev=4328&view=rev
Author: fgiust
Date: 2013-09-19 09:45:42 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
badly breaking everything by replacing Content with node :) stay away from this version until the upgrade is completed
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
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/BaseVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,15 +20,13 @@
package net.sourceforge.openutils.mgnlmedia.media.tags.el;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.DefaultContent;
import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.i18n.I18nContentWrapper;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.cms.util.NodeMapWrapper;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.ContentMap;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.NodeWrapperFactory;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
import java.awt.Point;
import java.util.ArrayList;
@@ -36,13 +34,14 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
import javax.jcr.query.InvalidQueryException;
import javax.servlet.http.HttpServletRequest;
@@ -95,7 +94,7 @@
*/
public static MediaModule module()
{
- return (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
+ return (MediaModule) Components.getComponent(ModuleRegistry.class).getModuleInstance(MediaModule.NAME);
}
/**
@@ -103,7 +102,7 @@
* @param obj content node or node UUID or jcr absolute path in media repository
* @return content node
*/
- public static Content node(Object obj)
+ public static Node node(Object obj)
{
if (obj == null)
{
@@ -114,22 +113,7 @@
if (node != null)
{
- Content currentpage = null;
-
- if (MgnlContext.isWebContext())
- {
- currentpage = MgnlContext.getAggregationState().getMainContent();
- }
-
- if (currentpage == null)
- {
- currentpage = new DefaultContent(node);
- }
-
- Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(node)),
- currentpage.getHandle());
- return content;
+ return Components.getComponent(NodeWrapperFactory.class).wrapNode(node);
}
return null;
@@ -153,7 +137,7 @@
*/
public static String urlParams(Object mediaref, Map<String, String> options)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
return null;
@@ -174,7 +158,7 @@
public static String thumbnail(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -199,7 +183,7 @@
{
return null;
}
- return NodeDataUtil.getString(node(media), "type");
+ return PropertyUtil.getString(node(media), "type");
}
/**
@@ -210,11 +194,11 @@
public static String[] resolutions(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
List<String> res = new ArrayList<String>();
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
Collection<NodeData> nodeDataCollection = resolutions.getNodeDataCollection();
@@ -246,7 +230,7 @@
public static String urlres(Object mediaref, String resolution)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -271,7 +255,7 @@
return null;
}
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
try
{
@@ -300,7 +284,7 @@
public static int[] size(Object mediaref, String resolution)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media != null)
{
@@ -312,7 +296,7 @@
}
else
{
- Content resolutions = getResolutionsNode(media);
+ Node resolutions = getResolutionsNode(media);
if (resolutions != null)
{
try
@@ -360,7 +344,7 @@
public static String preview(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -382,7 +366,7 @@
public static String[] usedInWebPages(Object mediaref)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
if (media == null)
{
@@ -391,7 +375,7 @@
}
try
{
- List<String> retVal = mcm.getUsedInWebPages(media.getUUID());
+ List<String> retVal = mcm.getUsedInWebPages(media.getIdentifier());
return (CollectionUtils.isNotEmpty(retVal) ? retVal.toArray(new String[retVal.size()]) : EMPTY_STRING_ARRAY);
}
catch (InvalidQueryException e)
@@ -416,11 +400,11 @@
public static Object property(Object mediaref, String property)
{
- Content media = node(mediaref);
+ Node media = node(mediaref);
try
{
- if (media == null || !media.hasNodeData(property))
+ if (media == null || !media.hasProperty(property))
{
return null;
}
@@ -430,8 +414,17 @@
// return null;
}
- return getValueAsObject(media.getNodeData(property).getValue());
+ try
+ {
+ return getValueAsObject(media.getProperty(property).getValue());
+ }
+ catch (RepositoryException e)
+ {
+ log.debug("RepositoryException reading property " + property + " from " + media, e);
+ }
+ return null;
+
}
/**
@@ -501,15 +494,15 @@
* @param media
* @return
*/
- protected static Content getResolutionsNode(final Content media)
+ protected static Node getResolutionsNode(final Node media)
{
- Content resolutions = null;
+ Node resolutions = null;
try
{
- if (media.hasContent("resolutions"))
+ if (media.hasNode("resolutions"))
{
- resolutions = media.getContent("resolutions");
+ resolutions = media.getNode("resolutions");
}
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,12 +20,12 @@
package net.sourceforge.openutils.mgnlmedia.media.types;
import info.magnolia.cms.beans.runtime.MultipartForm;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.security.AccessDeniedException;
import java.io.File;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -58,105 +58,105 @@
* init handler
* @param typeDefinitionNode type definition node
*/
- void init(Content typeDefinitionNode);
+ void init(Node typeDefinitionNode);
/**
* return true if media has no binary-data
* @param media media
* @return true if media has no binary-data
*/
- boolean isExternal(Content media);
+ boolean isExternal(Node media);
/**
* return thumbnail absolute url
* @param media media
* @return url
*/
- String getUrl(Content media);
+ String getUrl(Node media);
/**
* @param media
* @param options
* @return url
*/
- String getUrl(Content media, Map<String, String> options);
+ String getUrl(Node media, Map<String, String> options);
/**
* return thumbnail absolute url
* @param media media
* @return url
*/
- String getThumbnailUrl(Content media);
+ String getThumbnailUrl(Node media);
/**
* return thumbnail absolute url
* @param media media
* @return url
*/
- String getPreviewUrl(Content media);
+ String getPreviewUrl(Node media);
/**
* return filename
* @param media media
* @return filename
*/
- String getFilename(Content media);
+ String getFilename(Node media);
/**
* return filename
* @param media media
* @return filename
*/
- String getExtension(Content media);
+ String getExtension(Node media);
/**
* return filename
* @param media media
* @return filename
*/
- String getFullFilename(Content media);
+ String getFullFilename(Node media);
/**
* return title
* @param media media
* @return title
*/
- String getTitle(Content media);
+ String getTitle(Node media);
/**
* return tags
* @param media media
* @return tags
*/
- String getTags(Content media);
+ String getTags(Node media);
/**
* return description
* @param media media
* @return description
*/
- String getDescription(Content media);
+ String getDescription(Node media);
/**
* return abstract
* @param media media
* @return abstract
*/
- String getAbstract(Content media);
+ String getAbstract(Node media);
/**
* Returns the basic media info (file type, size for images, ...)
* @param media media
* @return a formatted string for media info
*/
- Map<String, String> getMediaInfo(Content media);
+ Map<String, String> getMediaInfo(Node media);
/**
* Called from dialog when saving a media
* @param media media saving
* @return true if continue saving
*/
- boolean onPostSave(Content media);
+ boolean onPostSave(Node media);
/**
* Get the name for a new node
@@ -188,20 +188,20 @@
* @exception RepositoryException repository exception
* @exception AccessDeniedException access denied exception
*/
- boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
+ boolean onSavingPropertyMedia(Node media, Node parentNode, Node configNode, String name,
HttpServletRequest request, MultipartForm form, int type, int valueType, int isRichEditValue, int encoding)
throws RepositoryException, AccessDeniedException;
/**
* save a media file to a newly created media content
- * @param media media content to save to
+ * @param media media Node to save to
* @param f file input stream
* @param cleanFileName file name without extension
* @param extension file extension
* @exception RepositoryException exception working on repository
* @exception AccessDeniedException exception accessing node
*/
- void saveFromZipFile(Content media, File f, String cleanFileName, String extension) throws AccessDeniedException,
+ void saveFromZipFile(Node media, File f, String cleanFileName, String extension) throws AccessDeniedException,
RepositoryException;
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,7 +19,7 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
+import javax.jcr.Node;
/**
@@ -33,7 +33,7 @@
/**
* {@inheritDoc}
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Node media)
{
return "/.resources/media/icons/thumb-audio.png";
}
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-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -22,11 +22,11 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.beans.runtime.MultipartForm;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -36,6 +36,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -59,7 +60,7 @@
{
/**
- * Nodedata name where original media content is saved
+ * Nodedata name where original media Node is saved
*/
public static final String ORGINAL_NODEDATA_NAME = "original";
@@ -73,7 +74,7 @@
/**
* {@inheritDoc}
*/
- public void init(Content typeDefinitionNode)
+ public void init(Node typeDefinitionNode)
{
type = typeDefinitionNode.getName();
}
@@ -94,7 +95,7 @@
/**
* {@inheritDoc}
*/
- public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
+ public boolean onSavingPropertyMedia(Node media, Node parentNode, Node configNode, String name,
HttpServletRequest request, MultipartForm form, int type, int valueType, int isRichEditValue, int encoding)
throws RepositoryException, AccessDeniedException
{
@@ -126,7 +127,7 @@
/**
* {@inheritDoc}
*/
- public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
+ public void saveFromZipFile(Node media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
Document doc = new Document(f, type + extension);
@@ -138,7 +139,7 @@
/**
* {@inheritDoc}
*/
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
try
{
@@ -165,7 +166,7 @@
if (MediaEl.module().isSingleinstance())
{
- media.getMetaData().setActivated();
+ MetaDataUtil.getMetaData(media).setActivated();
media.save();
}
}
@@ -182,12 +183,12 @@
* @param media media
* @return default nodedata
*/
- protected NodeData getOriginalFileNodeData(Content media)
+ protected NodeData getOriginalFileNodeData(Node media)
{
return media.getNodeData(ORGINAL_NODEDATA_NAME);
}
- public boolean isExternal(Content media)
+ public boolean isExternal(Node media)
{
try
{
@@ -203,7 +204,7 @@
/**
* {@inheritDoc}
*/
- public String getExtension(Content media)
+ public String getExtension(Node media)
{
return getOriginalFileNodeData(media).getAttribute(FileProperties.PROPERTY_EXTENSION);
}
@@ -211,7 +212,7 @@
/**
* {@inheritDoc}
*/
- public String getFilename(Content media)
+ public String getFilename(Node media)
{
return getOriginalFileNodeData(media).getAttribute(FileProperties.PROPERTY_FILENAME);
}
@@ -219,7 +220,7 @@
/**
* {@inheritDoc}
*/
- public String getFullFilename(Content media)
+ public String getFullFilename(Node media)
{
return getFilename(media)
+ (StringUtils.isNotBlank(getExtension(media)) ? "." + getExtension(media) : StringUtils.EMPTY);
@@ -228,7 +229,7 @@
/**
* {@inheritDoc}
*/
- public String getUrl(Content media, Map<String, String> options)
+ public String getUrl(Node media, Map<String, String> options)
{
String filenameEncoded = getFullFilename(media);
try
@@ -250,7 +251,7 @@
/**
* {@inheritDoc}
*/
- public String getUrl(Content media)
+ public String getUrl(Node media)
{
return getUrl(media, null);
}
@@ -258,7 +259,7 @@
/**
* {@inheritDoc}
*/
- public String getPreviewUrl(Content media)
+ public String getPreviewUrl(Node media)
{
return getUrl(media);
}
@@ -266,7 +267,7 @@
/**
* {@inheritDoc}
*/
- public String getTitle(Content media)
+ public String getTitle(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "title").getString();
}
@@ -274,7 +275,7 @@
/**
* {@inheritDoc}
*/
- public String getTags(Content media)
+ public String getTags(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "tags").getString();
}
@@ -282,7 +283,7 @@
/**
* {@inheritDoc}
*/
- public String getDescription(Content media)
+ public String getDescription(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "description").getString();
}
@@ -290,7 +291,7 @@
/**
* {@inheritDoc}
*/
- public String getAbstract(Content media)
+ public String getAbstract(Node media)
{
return I18nContentSupportFactory.getI18nSupport().getNodeData(media, "abstract").getString();
}
@@ -298,7 +299,7 @@
/**
* {@inheritDoc}
*/
- public Map<String, String> getMediaInfo(Content media)
+ public Map<String, String> getMediaInfo(Node media)
{
Map<String, String> info = new LinkedHashMap<String, String>();
@@ -352,7 +353,7 @@
* @param info map containing metadata keys/values
* @param key nodedata name
*/
- protected void addToInfo(Content media, Map<String, String> info, String key)
+ protected void addToInfo(Node media, Map<String, String> info, String key)
{
NodeData data = media.getNodeData(key);
@@ -384,6 +385,5 @@
{
// Do nothing
}
-
-
+
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,11 +19,12 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.NodeDataUtil;
import java.util.Map;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaMetadataFormatUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.VideoMedataUtils.VideoMetaData;
@@ -42,10 +43,10 @@
*/
private Logger log = LoggerFactory.getLogger(BaseVideoTypeHandler.class);
- protected abstract VideoMetaData parseFLVMetaData(Content media) throws Exception;
+ protected abstract VideoMetaData parseFLVMetaData(Node media) throws Exception;
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
try
{
@@ -87,7 +88,7 @@
* {@inheritDoc}
*/
@Override
- public Map<String, String> getMediaInfo(Content media)
+ public Map<String, String> getMediaInfo(Node media)
{
Map<String, String> info = super.getMediaInfo(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
@@ -34,6 +33,7 @@
import java.util.List;
import javax.imageio.ImageIO;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -67,7 +67,7 @@
* {@inheritDoc}
*/
@Override
- public String getUrl(Content media)
+ public String getUrl(Node media)
{
return getUrl(media, Collections.<String, String> emptyMap());
}
@@ -76,7 +76,7 @@
* {@inheritDoc}
*/
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
NodeData data = getOriginalFileNodeData(media);
@@ -120,7 +120,7 @@
* @param stream inputStream for the original pdf
* @param filename original filename
*/
- protected void createPdfPreview(Content media, InputStream stream, String filename)
+ protected void createPdfPreview(Node media, InputStream stream, String filename)
{
PDDocument document = null;
@@ -193,7 +193,7 @@
* @param file File to be copied
* @param filename filename
*/
- protected void copyPreviewImageToRepository(Content media, File file, String filename)
+ protected void copyPreviewImageToRepository(Node media, File file, String filename)
{
Document doc = new Document(file, "image/png");
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -21,7 +21,6 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.beans.runtime.MultipartForm;
-import info.magnolia.cms.core.Content;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -38,6 +37,7 @@
import java.util.UUID;
import javax.jcr.AccessDeniedException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
@@ -94,7 +94,7 @@
* {@inheritDoc}
*/
@Override
- public void init(Content typeDefinitionNode)
+ public void init(Node typeDefinitionNode)
{
super.init(typeDefinitionNode);
}
@@ -131,7 +131,7 @@
* {@inheritDoc}
*/
@Override
- public String getFilename(Content media)
+ public String getFilename(Node media)
{
return getUrl(media);
}
@@ -140,13 +140,13 @@
* {@inheritDoc}
*/
@Override
- public String getExtension(Content media)
+ public String getExtension(Node media)
{
return null;
}
@Override
- public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
+ public void saveFromZipFile(Node media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
@@ -156,7 +156,7 @@
* {@inheritDoc}
*/
@Override
- public String getUrl(Content media, Map<String, String> options)
+ public String getUrl(Node media, Map<String, String> options)
{
String url = media.getNodeData("videoUrl").getString();
@@ -221,7 +221,7 @@
}
@Override
- protected VideoMetaData parseFLVMetaData(Content media) throws Exception
+ protected VideoMetaData parseFLVMetaData(Node media) throws Exception
{
if (!parseremotefiles)
{
@@ -301,7 +301,7 @@
* {@inheritDoc}
*/
@Override
- public String getUrl(Content media)
+ public String getUrl(Node media)
{
return getUrl(media, null);
}
@@ -310,7 +310,7 @@
* {@inheritDoc}
*/
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
if (parseremotefiles)
@@ -347,7 +347,7 @@
* @param media
* @param previewUrl
*/
- private void copyPreviewImageToRepository(Content media, String previewUrl)
+ private void copyPreviewImageToRepository(Node media, String previewUrl)
{
InputStream is = null;
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,13 +20,14 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
import java.awt.image.BufferedImage;
import java.io.InputStream;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.IcoUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
@@ -54,7 +55,7 @@
/**
* {@inheritDoc}
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Node media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail", BaseTypeHandler.ORGINAL_NODEDATA_NAME))
{
@@ -72,7 +73,7 @@
* {@inheritDoc}
*/
@Override
- public String getPreviewUrl(Content media)
+ public String getPreviewUrl(Node media)
{
if (!ImageUtils.checkOrCreateResolution(media, "preview", BaseTypeHandler.ORGINAL_NODEDATA_NAME))
{
@@ -87,7 +88,7 @@
}
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
InputStream stream = null;
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,12 +19,13 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.util.NodeDataUtil;
import java.awt.Dimension;
import java.io.InputStream;
+import javax.jcr.Node;
+
import org.apache.commons.io.IOUtils;
import org.devlib.schmidt.imageinfo.ImageInfo;
import org.freehep.graphicsio.swf.SWFHeader;
@@ -47,7 +48,7 @@
private Logger log = LoggerFactory.getLogger(SwfTypeHandler.class);
@Override
- public boolean onPostSave(Content media)
+ public boolean onPostSave(Node media)
{
InputStream stream = null;
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -20,10 +20,11 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
import java.io.InputStream;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlmedia.media.utils.VideoMedataUtils;
import net.sourceforge.openutils.mgnlmedia.media.utils.VideoMedataUtils.VideoMetaData;
@@ -48,7 +49,7 @@
protected final String DURATION_ATTRIBUTE = "duration";
@Override
- protected VideoMetaData parseFLVMetaData(Content media) throws Exception
+ protected VideoMetaData parseFLVMetaData(Node media) throws Exception
{
InputStream stream = getOriginalFileNodeData(media).getStream();
try
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-19 09:45:42 UTC (rev 4328)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.playlist.utils;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
@@ -152,7 +151,7 @@
public MediaNodeAndEntryPath apply(Node playlistEntry)
{
String mediaUUID = PropertyUtil.getString(playlistEntry, "media");
- Content mediaNode = MediaEl.node(mediaUUID);
+ Node mediaNode = MediaEl.node(mediaUUID);
if (mediaNode == null)
{
log.warn(
@@ -163,7 +162,7 @@
NodeUtil.getPathIfPossible(playlistNode) });
}
- return new MediaNodeAndEntryPath(mediaNode.getJCRNode(), NodeUtil
+ return new MediaNodeAndEntryPath(mediaNode, NodeUtil
.getPathIfPossible(playlistEntry));
}
});
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-18 21:04:37 UTC (rev 4327)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2013-09-19 09:45:42 UTC (rev 4328)
@@ -70,7 +70,7 @@
<display-name>node</display-name>
<name>node</name>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
- <function-signature>info.magnolia.cms.core.Content node(java.lang.Object)</function-signature>
+ <function-signature>javax.jcr.Node node(java.lang.Object)</function-signature>
<example>
<![CDATA[
<c:set var="mediaNode" value="${media:node(content.image)}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 21:04:41
|
Revision: 4327
http://openutils.svn.sourceforge.net/openutils/?rev=4327&view=rev
Author: fgiust
Date: 2013-09-18 21:04:37 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
drop ContentMap, use Node for everything
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/media-samples.css
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 21:04:37 UTC (rev 4327)
@@ -39,6 +39,7 @@
import java.util.Locale;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -109,9 +110,9 @@
return null;
}
- ContentMap contentMap = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
+ Node node = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
- if (contentMap != null)
+ if (node != null)
{
Content currentpage = null;
@@ -122,11 +123,11 @@
if (currentpage == null)
{
- currentpage = new DefaultContent(contentMap.getJCRNode());
+ currentpage = new DefaultContent(node);
}
Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(contentMap.getJCRNode())),
+ new I18nContentWrapper(new DefaultContent(node)),
currentpage.getHandle());
return content;
}
@@ -531,10 +532,10 @@
return null;
}
- ContentMap playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
+ Node playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
Iterator<ContentMap> iter = Iterators.transform(
- PlaylistIterateUtils.iterate(playlistNode.getJCRNode()),
+ PlaylistIterateUtils.iterate(playlistNode),
new Function<MediaNodeAndEntryPath, ContentMap>()
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-09-18 21:04:37 UTC (rev 4327)
@@ -5,7 +5,7 @@
<jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
<jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node; if not specified, 'node' and 'property' attributes will be used"/>
- <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="the content object to use; if not specified, object 'content' will be used"/>
+ <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="java.lang.Object" description="the content object to use; if not specified, object 'content' will be used"/>
<jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
<jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-09-18 21:04:37 UTC (rev 4327)
@@ -11,10 +11,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${content.title}</title>
<cms:init />
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/media-samples.css" />
</head>
<body>
- <h1>${content.title}</h1>
- <cms:area name="main" />
+ <div class="container">
+ <h1>${content.title}</h1>
+ <cms:area name="main" />
+ </div>
</body>
</html>
-</jsp:root>
+</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css 2013-09-18 21:04:37 UTC (rev 4327)
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:47:45
|
Revision: 4326
http://openutils.svn.sourceforge.net/openutils/?rev=4326&view=rev
Author: fgiust
Date: 2013-09-18 12:47:40 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 12:47:30 UTC (rev 4325)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 12:47:40 UTC (rev 4326)
@@ -11,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>4.5.0</version>
+ <version>4.5.1-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.0</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.0</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.0</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:47:33
|
Revision: 4325
http://openutils.svn.sourceforge.net/openutils/?rev=4325&view=rev
Author: fgiust
Date: 2013-09-18 12:47:30 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcontextmenu-4.5.0
Added Paths:
-----------
tags/openutils-mgnlcontextmenu-4.5.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:47:23
|
Revision: 4324
http://openutils.svn.sourceforge.net/openutils/?rev=4324&view=rev
Author: fgiust
Date: 2013-09-18 12:47:18 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcontextmenu-4.5.0
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 12:41:41 UTC (rev 4323)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 12:47:18 UTC (rev 4324)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -12,7 +11,7 @@
<artifactId>openutils-mgnlcontextmenu</artifactId>
<name>ContextMenu Module for Magnolia CMS</name>
<description>A magnolia module for editing content via context menu</description>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.5.0</version>
<inceptionYear>2010</inceptionYear>
<licenses>
<license>
@@ -26,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.0</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.0</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcontextmenu-4.5.0</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:41:46
|
Revision: 4323
http://openutils.svn.sourceforge.net/openutils/?rev=4323&view=rev
Author: fgiust
Date: 2013-09-18 12:41:41 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 12:41:30 UTC (rev 4322)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 12:41:41 UTC (rev 4323)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlrules</artifactId>
<name>Rules module for Magnolia CMS</name>
- <version>4.5.0</version>
+ <version>4.5.1-SNAPSHOT</version>
<description>A simple rule engine integrated into Magnolia CMS</description>
<licenses>
<license>
@@ -25,9 +25,9 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlrules-4.5.0</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlrules-4.5.0</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlrules-4.5.0</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlrules</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:41:34
|
Revision: 4322
http://openutils.svn.sourceforge.net/openutils/?rev=4322&view=rev
Author: fgiust
Date: 2013-09-18 12:41:30 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlrules-4.5.0
Added Paths:
-----------
tags/openutils-mgnlrules-4.5.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:41:14
|
Revision: 4321
http://openutils.svn.sourceforge.net/openutils/?rev=4321&view=rev
Author: fgiust
Date: 2013-09-18 12:41:09 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlrules-4.5.0
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 12:41:09 UTC (rev 4321)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -11,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlrules</artifactId>
<name>Rules module for Magnolia CMS</name>
- <version>5.0.0-SNAPSHOT</version>
+ <version>4.5.0</version>
<description>A simple rule engine integrated into Magnolia CMS</description>
<licenses>
<license>
@@ -26,9 +25,9 @@
</issueManagement>
<inceptionYear>2010</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlrules</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlrules</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlrules-4.5.0</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlrules-4.5.0</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlrules-4.5.0</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:31:38
|
Revision: 4320
http://openutils.svn.sourceforge.net/openutils/?rev=4320&view=rev
Author: fgiust
Date: 2013-09-18 12:31:25 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
upgrade magnolia version
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/
Property Changed:
----------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -270,7 +270,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
<stk.version>2.0</stk.version>
<jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps 2013-09-18 12:31:25 UTC (rev 4320)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
expressions
+rules
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-09-18 12:31:25 UTC (rev 4320)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
___________________________________________________________________
Modified: svn:ignore
## -6,3 +6,4 ##
samples-contextmenu
samples-stripes
samples-struts11
+samples-rules
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -85,6 +85,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -95,6 +95,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -170,6 +170,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java 2013-09-18 12:31:25 UTC (rev 4320)
@@ -1,3 +1,22 @@
+/**
+ *
+ * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
package net.sourceforge.openutils.mgnlcontextmenu.servlet;
import info.magnolia.cms.security.Permission;
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -119,6 +119,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -100,6 +100,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -206,6 +206,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -108,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -270,6 +270,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -139,6 +139,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -99,6 +99,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -147,6 +147,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -105,6 +105,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -115,6 +115,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -127,6 +127,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -133,6 +133,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -150,6 +150,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 11:01:54
|
Revision: 4319
http://openutils.svn.sourceforge.net/openutils/?rev=4319&view=rev
Author: fgiust
Date: 2013-09-18 11:01:51 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
styles
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-18 08:48:42 UTC (rev 4318)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-18 11:01:51 UTC (rev 4319)
@@ -23,6 +23,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
@@ -79,9 +80,11 @@
{
ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
- // LB crazy command! mgnl argsss
Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
- return strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null;
+
+ String result = strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null;
+
+ return result;
}
public static String scripts()
@@ -104,16 +107,16 @@
out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+ ctx
+ "/.resources/contextmenu/css/jquery.contextMenu.css\" media=\"screen\" />\n");
-// out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
-// + ctx
-// + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
-// out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
+ // out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+ // + ctx
+ // + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
+ // out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery.contextMenu.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-addMenu.js\"></script>\n");
-// if(mgnlSortLists != null){
+ // if(mgnlSortLists != null){
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-sortList.js\"></script>\n");
-// }
+ // }
out.append("<!-- end contextmenu:links -->\n");
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-18 08:48:42 UTC (rev 4318)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-18 11:01:51 UTC (rev 4319)
@@ -29,7 +29,7 @@
<sv:value>2010-05-18T14:33:10.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-17T00:12:45.280+02:00</sv:value>
+ <sv:value>2013-09-18T12:52:41.534+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:pages/contextmenu-template-jsp</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2010-05-18T16:43:29.812+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-17T00:12:45.280+02:00</sv:value>
+ <sv:value>2013-09-18T12:52:41.534+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -270,7 +270,7 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="message" sv:type="String">
- <sv:value>Right click here to edit a</sv:value>
+ <sv:value>Right click here to edit</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -286,7 +286,7 @@
<sv:value>2013-09-15T20:41:06.907+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-17T00:09:46.142+02:00</sv:value>
+ <sv:value>2013-09-18T12:38:34.813+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:components/samples-contextmenu-message-freemarker</sv:value>
@@ -366,14 +366,14 @@
<sv:value>f9c61bcf-32de-45c2-8ceb-1435e1411060</sv:value>
</sv:property>
<sv:property sv:name="firstname" sv:type="String">
- <sv:value>label</sv:value>
+ <sv:value>First Name:</sv:value>
</sv:property>
+ <sv:property sv:name="firstname.help" sv:type="String">
+ <sv:value><p>help!</p></sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="lastname.help" sv:type="String">
- <sv:value><p>luca</p></sv:value>
- </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -388,7 +388,7 @@
<sv:value>2013-09-13T18:56:07.081+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-13T19:00:55.111+02:00</sv:value>
+ <sv:value>2013-09-18T12:52:41.533+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:components/samples-contextmenu-form</sv:value>
@@ -412,14 +412,14 @@
<sv:value>1,0</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <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>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-09-18 08:48:42 UTC (rev 4318)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-09-18 11:01:51 UTC (rev 4319)
@@ -1,79 +1,126 @@
/* Generic context menu styles */
.contextMenu {
- position: absolute;
- width: 150px;
- z-index: 99999;
- border: solid 1px #CCC;
- background: #EEE;
- padding: 0px;
- margin: 0px;
- display: none;
+ position: absolute;
+ width: 150px;
+ z-index: 99999;
+ border: solid 1px #CCC;
+ background: #EEE;
+ padding: 0px;
+ margin: 0px;
+ display: none;
}
-.contextMenu LI {
- list-style: none;
- padding: 0px;
- margin: 0px;
+.contextMenu li {
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
}
-.contextMenu A {
- color: #333;
- text-decoration: none;
- display: block;
- line-height: 20px;
- height: 20px;
- background-position: 6px center;
- background-repeat: no-repeat;
- outline: none;
- padding: 1px 5px;
- padding-left: 28px;
+.contextMenu a {
+ color: #333;
+ text-decoration: none;
+ display: block;
+ line-height: 20px;
+ height: 20px;
+ background-position: 6px center;
+ background-repeat: no-repeat;
+ outline: none;
+ padding: 1px 5px;
+ padding-left: 28px;
+ font-family: arial, helvetica, sans-serif;
+ font-size: 12px;
}
-.contextMenu LI.hover A {
- color: #FFF;
- background-color: #3399FF;
+.contextMenu LI.hover a {
+ color: #FFF;
+ background-color: #3399FF;
}
-.contextMenu LI.disabled A {
- color: #AAA;
- cursor: default;
+.contextMenu LI.disabled a {
+ color: #AAA;
+ cursor: default;
}
-.contextMenu LI.hover.disabled A {
- background-color: transparent;
+.contextMenu LI.hover.disabled a {
+ background-color: transparent;
}
.contextMenu LI.separator {
- border-top: solid 1px #CCC;
+ border-top: solid 1px #CCC;
}
-.contextMenu LI.menuText A { background-image: url(images/menu-text.png); }
-.contextMenu LI.menuHelp A { background-image: url(images/menu-help.png); }
-.contextMenu LI.menuMove A { background-image: url(images/menu-move.gif); }
+.contextMenu li.menuText a {
+ background-image: url(images/menu-text.png);
+}
-.contextMenu LI.menuLabel A { background-image: url(images/menu-label.png); }
-.contextMenu LI.menuDescription A { background-image: url(images/menu-description.png); }
-.contextMenu LI.menuMedia A { background-image: url(images/menu-media.png); }
-.contextMenu LI.menuInfo A { background-image: url(images/menu-info.png); }
-.contextMenu LI.menuValidation A { background-image: url(images/menu-validation.gif); }
-.contextMenu LI.menuHeader A { background-image: url(images/menu-header.png); }
-.contextMenu LI.menuScTrackAction A { background-image: url(images/power_off.png); }
-.contextMenu LI.menuScTrackAction A.scTrackOn { background-image: url(images/power_on.png); }
+.contextMenu li.menuHelp a {
+ background-image: url(images/menu-help.png);
+}
+.contextMenu li.menuMove a {
+ background-image: url(images/menu-move.gif);
+}
+.contextMenu li.menuLabel a {
+ background-image: url(images/menu-label.png);
+}
+
+.contextMenu li.menuDescription a {
+ background-image: url(images/menu-description.png);
+}
+
+.contextMenu li.menuMedia a {
+ background-image: url(images/menu-media.png);
+}
+
+.contextMenu li.menuInfo a {
+ background-image: url(images/menu-info.png);
+}
+
+.contextMenu li.menuValidation a {
+ background-image: url(images/menu-validation.gif);
+}
+
+.contextMenu li.menuHeader a {
+ background-image: url(images/menu-header.png);
+}
+
+.contextMenu li.menuScTrackAction a {
+ background-image: url(images/power_off.png);
+}
+
+.contextMenu li.menuScTrackAction a.scTrackOn {
+ background-image: url(images/power_on.png);
+}
+
.sort-list .drop {
display: none;
margin: 0;
padding: 0;
}
-.move .drop {
+.move .dropXX {
display: block;
height: 8px;
border: 1px solid #666;
background-color: #CCC;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
cursor: pointer;
+}
+
+.move .drop {
+ margin: 2px 0;
+ height: 12px;
+ display: block;
+ font-size: 12px;
+ color: #ffffff;
+ text-align: center;
+ background-color: #5cb85c;
+ -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+ box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+ -webkit-transition: width 0.6s ease;
+ transition: width 0.6s ease;
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ cursor: pointer;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4318
http://openutils.svn.sourceforge.net/openutils/?rev=4318&view=rev
Author: fgiust
Date: 2013-09-18 08:48:42 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
fix dependency on mgnlutils
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java 2013-09-17 12:24:07 UTC (rev 4317)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java 2013-09-18 08:48:42 UTC (rev 4318)
@@ -21,7 +21,6 @@
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -79,9 +78,10 @@
{
node.setProperty(name, value);
}
- else
+ else if (node.hasProperty(name))
{
- NodeUtilsExt.deletePropertyIfExist(node, name);
+ node.getProperty(name).remove();
}
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-17 12:24:10
|
Revision: 4317
http://openutils.svn.sourceforge.net/openutils/?rev=4317&view=rev
Author: lucaboati
Date: 2013-09-17 12:24:07 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
menu configured via mgnl config, no more jsp included
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-16 23:33:31 UTC (rev 4316)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-17 12:24:07 UTC (rev 4317)
@@ -46,18 +46,20 @@
{
StringBuilder out = new StringBuilder();
- // out.append("<script type=\"text/javascript\">\n");
- // out.append("var mgnlContextMenuInfo = {\n");
- // out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n");
- // out.append(" menus: " + menusJs() + ",\n");
- // out.append(" elements: " + elementsJs() + "\n");
- // out.append("};\n");
- // out.append("</script>\n");
+ out.append("<script type=\"text/javascript\">\n");
+ out.append("var mgnlContextMenuInfo = {\n");
+ out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n");
+ out.append(" menus: " + menusJs() + ",\n");
+ out.append(" elements: " + elementsJs() + "\n");
+ out.append("};\n");
+ out.append("</script>\n");
out.append("<!-- start contextmenu:scripts -->\n");
out.append("<script type=\"text/javascript\">\n");
out.append("jQuery(document).ready(function() {\n");
- out.append(" jQuery.mgnlAddContextMenu(" + ContextMenuElFunctions.editMessageInfosJs() + ");\n");
+ out.append(" jQuery.mgnlAddContextMenu("
+ + ContextMenuElFunctions.editMessageInfosJs()
+ + ", mgnlContextMenuInfo );\n");
out.append("});\n");
out.append("</script>\n");
out.append("<!-- end contextmenu:scripts -->\n");
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml 2013-09-17 12:24:07 UTC (rev 4317)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="formField" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7ed5d7a8-fa8b-4eff-a555-59269837173c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mouseoverClass" sv:type="String">
+ <sv:value>contextmenuOver</sv:value>
+ </sv:property>
+ <sv:property sv:name="mouseoverIcon" sv:type="String">
+ <sv:value>/.resources/contextmenu/img/rightclicktoedit.png</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:08.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T13:22:34.156+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="items">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>8283321a-967a-411c-884d-1e74d96adf0d</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:40.359+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T13:22:22.646+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="label">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2305a310-8910-48f7-a062-4371667797ca</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-text.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Edit label</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:14:38.290+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="description">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>69b042c5-5a51-4843-a3e3-9ea4a21e2a12</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-description.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Edit description</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:14:20.015+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="help">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>da3a489f-06d9-4393-86b2-9452b4bde691</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-help.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Edit help</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:14:09.968+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="move">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ddfc1626-d328-47e5-a501-e3cccb854081</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>move</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-move.gif</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Move field</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:19:59.928+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml 2013-09-17 12:24:07 UTC (rev 4317)
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="simpleForm" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>dd4ec6aa-a45b-4d15-a3c6-d24a8689c546</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mouseoverClass" sv:type="String">
+ <sv:value>contextmenuOver</sv:value>
+ </sv:property>
+ <sv:property sv:name="mouseoverIcon" sv:type="String">
+ <sv:value>/.resources/contextmenu/img/rightclicktoedit.png</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:08.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:16:23.695+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="items">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>49937044-09e6-4902-83a8-1555b8d997df</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:40.359+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:16:19.712+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="label">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e16bbb4a-c477-4e15-baea-9e1892535e7d</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-text.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Edit label</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:16:19.712+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="description">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>60e05670-07b2-4ac0-81cf-f11da06b394b</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-description.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Edit description</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:16:19.712+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="help">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>def69d0e-9d57-40f2-b5ec-d6b741bf29d2</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>fckEdit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-help.png</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="text" sv:type="String">
+ <sv:value>Edit help</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-17T14:16:19.712+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-16 23:33:31 UTC (rev 4316)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-17 12:24:07 UTC (rev 4317)
@@ -48,15 +48,8 @@
</section>
<cms:area name="main" />
</div>
- <!-- TO BE CUSTOMIZE -->
- <jsp:include page="/templates/samples-contextmenu/page-editmenu.jsp" />
+ <!-- <jsp:include page="/templates/samples-contextmenu/page-editmenu.jsp" /> -->
${contextmenu:scripts()}
-<!-- <script type="text/javascript"> -->
-<!-- <![CDATA[ -->
-<!-- jQuery(document).ready(function() { -->
-<!-- jQuery.mgnlAddContextMenu(${contextmenu:editMessageInfosJs()}); -->
-<!-- });]]> -->
-<!-- </script> -->
<c:if test="${!empty mgnlSortLists}">
<script type="text/javascript">
<![CDATA[ jQuery(document).ready( function() {]]>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-16 23:33:31 UTC (rev 4316)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-17 12:24:07 UTC (rev 4317)
@@ -1,12 +1,33 @@
jQuery.extend({
- mgnlAddContextMenu: function( mgnlEditMessages ) {
+ mgnlAddContextMenu: function( mgnlEditMessages, mgnlContextMenuInfo ) {
+
+ jQuery.each(mgnlContextMenuInfo.menus, function(){
+ var ul = document.createElement('ul');
+ document.body.appendChild(ul);
+ jQuery(ul).attr('id', 'contextmenu-' + this.name).attr('class', 'contextMenu');
+ jQuery.each(this.items, function(){
+ var li = document.createElement('li');
+ ul.appendChild(li);
+ li.innerHTML = '<a href="#' + this.name + '" style=\"background-image: url(' + mgnlContextMenuInfo.contextPath + this.icon + ')\">' + this.text + '</a>';
+ });
+ if (this.mouseoverIcon){
+ var img = document.createElement('img');
+ jQuery(img)
+ .attr('id', 'contextmenufollow-' + this.name)
+ .attr('src', mgnlContextMenuInfo.contextPath + this.mouseoverIcon)
+ .css({ position: 'absolute', display: 'none' });
+ document.body.appendChild(img);
+ }
+ });
+
jQuery.each(mgnlEditMessages, function(id, info){
var initTrigger = function(trigger){
$(trigger).contextMenu({
- menu: (info.contextMenu || 'default') + 'ContextMenu',
+ menu: 'contextmenu-' + (info.contextMenu || 'default'),
showCallback: info.showCallback
}, function(action) {
switch (action){
+ case 'default':
case 'text':
case 'header':
mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
@@ -63,5 +84,7 @@
initTrigger(info.parentTrigger ? el.parents(info.parentTrigger + ':first') : el);
el.data("initTrigger", initTrigger);
});
+
+
}
});
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js 2013-09-16 23:33:31 UTC (rev 4316)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js 2013-09-17 12:24:07 UTC (rev 4317)
@@ -45,6 +45,7 @@
globalEnabled: menuItem.globalEnabled
});
});
+
if (menu.mouseoverClass || menu.mouseoverIcon){
var followId = 'contextmenufollow-' + menuName;
var follow = jQuery('#' + followId);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-16 23:33:35
|
Revision: 4316
http://openutils.svn.sourceforge.net/openutils/?rev=4316&view=rev
Author: lucaboati
Date: 2013-09-16 23:33:31 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
complete js refactoring, "move fields" functionality added + examples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/contextmenu-samples.css
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-description.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-header.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-help.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-info.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-label.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-media.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-move.gif
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-text.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-validation.gif
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/power_off.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/power_on.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-help.png
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/jquery.contextMenu.js
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-hint.png
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -21,16 +21,27 @@
import info.magnolia.cms.security.Permission;
import info.magnolia.context.MgnlContext;
+import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+
import javax.jcr.Node;
+import javax.servlet.http.HttpServletRequest;
import net.sourceforge.openutils.mgnlcontextmenu.configuration.PersistenceStrategy;
import net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule;
+import net.sourceforge.openutils.mgnlcontextmenu.tags.ElementInfo;
import net.sourceforge.openutils.mgnlcontextmenu.tags.MenuScripts;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +57,18 @@
*/
private static Logger log = LoggerFactory.getLogger(ContextMenuElFunctions.class);
+ private static final String EDIT_MESSAGE_INFOS_KEY = "mgnlEditMessageInfos";
+
/**
+ * A shortcut to get the current request.
+ * @return The request.
+ */
+ private static HttpServletRequest getRequest()
+ {
+ return ((WebContext) MgnlContext.getInstance()).getRequest();
+ }
+
+ /**
* Gets the entry value for the specified name, searching for it in the local and global entries corresponding to
* the given node. Local entries take precedence on the global ones.
* @param node
@@ -81,15 +103,128 @@
out.append("<!-- start contextmenu:links -->\n");
out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+ ctx
- + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
+ + "/.resources/contextmenu/css/jquery.contextMenu.css\" media=\"screen\" />\n");
+// out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""
+// + ctx
+// + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n");
+// out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n");
- out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n");
+ out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery.contextMenu.js\"></script>\n");
+ out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-addMenu.js\"></script>\n");
+// if(mgnlSortLists != null){
+ out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-sortList.js\"></script>\n");
+// }
out.append("<!-- end contextmenu:links -->\n");
-
-
}
return out.toString();
}
+ @SuppressWarnings({"rawtypes" })
+ private static Stack getSortListStack()
+ {
+ HttpServletRequest request = getRequest();
+ Stack stack = (Stack) request.getAttribute("SORT_LIST_STACK");
+ if (stack == null)
+ {
+ stack = new Stack();
+ request.setAttribute("SORT_LIST_STACK", stack);
+ }
+ return stack;
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes" })
+ public static void beginSortList()
+ {
+ getSortListStack().push(new ArrayList());
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes" })
+ public static void addSortListItem(String html)
+ {
+ ((List) getSortListStack().peek()).add(html);
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes" })
+ public static List endSortList(String order)
+ {
+ String[] tokens = StringUtils.splitPreserveAllTokens(order, ',');
+
+ List input = (List) getSortListStack().pop();
+ List output = new ArrayList(input.size());
+
+ int i = 0;
+ Iterator iter = input.iterator();
+ while (iter.hasNext())
+ {
+ String html = (String) iter.next();
+ int index = i < tokens.length ? NumberUtils.toInt(tokens[i], -1) : -1;
+ output.add(index >= 0 && index < input.size() ? input.get(index) : html);
+ i++;
+ }
+ return output;
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes" })
+ public static ElementInfo addEditMessageInfo(String key, String path, String elementId)
+ {
+ HttpServletRequest request = getRequest();
+ List list = (List) request.getAttribute(EDIT_MESSAGE_INFOS_KEY);
+ if (list == null)
+ {
+ list = new ArrayList();
+ request.setAttribute(EDIT_MESSAGE_INFOS_KEY, list);
+ }
+ ElementInfo item = new ElementInfo(key, path, elementId);
+ list.add(item);
+
+ return item;
+ }
+
+ @SuppressWarnings({"rawtypes" })
+ public static List editMessageInfos()
+ {
+ List list = (List) getRequest().getAttribute(EDIT_MESSAGE_INFOS_KEY);
+ return list != null ? list : Collections.EMPTY_LIST;
+ }
+
+ public static String editMessageInfosJs()
+ {
+ StringBuilder sb = new StringBuilder();
+ for (Object item : editMessageInfos())
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(',');
+ }
+ ElementInfo info = (ElementInfo) item;
+ sb.append("'").append(info.getElementId()).append("'");
+ sb.append(":{");
+ if (!StringUtils.isEmpty(info.getParentTrigger()))
+ {
+ sb.append("'parentTrigger':'").append(info.getParentTrigger()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getEntryName()))
+ {
+ sb.append("'entryName':'").append(info.getEntryName()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getContextMenu()))
+ {
+ sb.append("'contextMenu':'").append(info.getContextMenu()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getEnterMode()))
+ {
+ sb.append("'enterMode':'").append(info.getEnterMode()).append("',");
+ }
+ if (!StringUtils.isEmpty(info.getShowCallback()))
+ {
+ sb.append("'showCallback':").append(info.getShowCallback()).append(',');
+ }
+ sb.append("'key':'").append(info.getKey()).append("',");
+ sb.append("'path':'").append(info.getPath()).append("'");
+ sb.append('}');
+ }
+ return "{" + sb + "}";
+ }
+
}
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -0,0 +1,52 @@
+package net.sourceforge.openutils.mgnlcontextmenu.servlet;
+
+import info.magnolia.cms.security.Permission;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.repository.RepositoryConstants;
+
+import java.io.IOException;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SetPropertyServlet extends HttpServlet
+{
+
+ private Logger log = LoggerFactory.getLogger(SetPropertyServlet.class);
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ doPost(req, resp);
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ String path = req.getParameter("path");
+ String name = req.getParameter("name");
+ String value = req.getParameter("value");
+ try
+ {
+ Node node = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).getNode(path);
+ if (NodeUtil.isGranted(node, Permission.SET))
+ {
+ node.setProperty(name, value);
+ MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ }
+}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -25,28 +25,29 @@
* @author dschivo
* @version $Id$
*/
+
public class ElementInfo
{
/**
- * Paragraph's handle
+ * Message key
*/
- private final String path;
+ private final String key;
/**
- * HTML identifier of the element containing the content
+ * Entry name
*/
- private final String elementId;
+ private String entryName;
/**
- * Entry name
+ * Paragraph's handle
*/
- private String entryName;
+ private final String path;
/**
- * Context menu name
+ * HTML identifier of the element containing the message
*/
- private String contextMenu;
+ private final String elementId;
/**
* Wrapper HTML tag to which attach context menu
@@ -54,6 +55,11 @@
private String parentTrigger;
/**
+ * Context menu type
+ */
+ private String contextMenu;
+
+ /**
* Enter mode for FCK editor
*/
private String enterMode;
@@ -63,115 +69,73 @@
*/
private String showCallback;
- public ElementInfo(String path, String elementId)
+ public ElementInfo(String key, String path, String elementId)
{
+ this.key = key;
this.path = path;
this.elementId = elementId;
}
- /**
- * Returns the path.
- * @return the path
- */
+ public String getKey()
+ {
+ return key;
+ }
+
public String getPath()
{
return path;
}
- /**
- * Returns the elementId.
- * @return the elementId
- */
public String getElementId()
{
return elementId;
}
- /**
- * Returns the entryName.
- * @return the entryName
- */
- public String getEntryName()
+ public String getParentTrigger()
{
- return entryName;
+ return parentTrigger;
}
- /**
- * Sets the entryName.
- * @param entryName the entryName to set
- */
- public void setEntryName(String entryName)
+ public void setParentTrigger(String parentTrigger)
{
- this.entryName = entryName;
+ this.parentTrigger = parentTrigger;
}
- /**
- * Returns the contextMenu.
- * @return the contextMenu
- */
public String getContextMenu()
{
return contextMenu;
}
- /**
- * Sets the contextMenu.
- * @param contextMenu the contextMenu to set
- */
public void setContextMenu(String contextMenu)
{
this.contextMenu = contextMenu;
}
- /**
- * Returns the parentTrigger.
- * @return the parentTrigger
- */
- public String getParentTrigger()
+ public String getEnterMode()
{
- return parentTrigger;
+ return enterMode;
}
- /**
- * Sets the parentTrigger.
- * @param parentTrigger the parentTrigger to set
- */
- public void setParentTrigger(String parentTrigger)
+ public void setEnterMode(String enterMode)
{
- this.parentTrigger = parentTrigger;
+ this.enterMode = enterMode;
}
- /**
- * Returns the enterMode.
- * @return the enterMode
- */
- public String getEnterMode()
+ public String getEntryName()
{
- return enterMode;
+ return entryName;
}
- /**
- * Sets the enterMode.
- * @param enterMode the enterMode to set
- */
- public void setEnterMode(String enterMode)
+ public void setEntryName(String entryName)
{
- this.enterMode = enterMode;
+ this.entryName = entryName;
}
- /**
- * Returns the showCallback.
- * @return the showCallback
- */
public String getShowCallback()
{
return showCallback;
}
- /**
- * Sets the showCallback.
- * @param showCallback the showCallback to set
- */
public void setShowCallback(String showCallback)
{
this.showCallback = showCallback;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -19,17 +19,13 @@
package net.sourceforge.openutils.mgnlcontextmenu.tags;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.security.Permission;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import javax.jcr.Node;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -170,34 +166,23 @@
throw new JspException(e);
}
- ElementInfo info = addElementInfo(NodeUtil.getPathIfPossible(node), elementId);
+ ElementInfo einfo = ContextMenuElFunctions.addEditMessageInfo(
+ name,
+ NodeUtil.getPathIfPossible(node),
+ elementId);
if (!StringUtils.isEmpty(name))
{
- info.setEntryName(name);
+ einfo.setEntryName(name);
}
if (!StringUtils.isEmpty(menu))
{
- info.setContextMenu(menu);
+ einfo.setContextMenu(menu);
}
+
}
return EVAL_PAGE;
}
- @SuppressWarnings("unchecked")
- protected ElementInfo addElementInfo(String path, String elementId)
- {
- HttpServletRequest request = MgnlContext.getWebContext().getRequest();
- List infos = (List) request.getAttribute(ELEMENT_INFOS_KEY);
- if (infos == null)
- {
- infos = new ArrayList();
- request.setAttribute(ELEMENT_INFOS_KEY, infos);
- }
- ElementInfo info = new ElementInfo(path, elementId);
- infos.add(info);
- return info;
- }
-
private boolean canEdit()
{
return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -23,16 +23,12 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
-import java.io.IOException;
import java.util.List;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
-
import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenu;
import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuItem;
import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager;
+import net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions;
import org.apache.commons.lang.StringUtils;
@@ -50,15 +46,22 @@
{
StringBuilder out = new StringBuilder();
+ // out.append("<script type=\"text/javascript\">\n");
+ // out.append("var mgnlContextMenuInfo = {\n");
+ // out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n");
+ // out.append(" menus: " + menusJs() + ",\n");
+ // out.append(" elements: " + elementsJs() + "\n");
+ // out.append("};\n");
+ // out.append("</script>\n");
+
out.append("<!-- start contextmenu:scripts -->\n");
out.append("<script type=\"text/javascript\">\n");
- out.append("var mgnlContextMenuInfo = {\n");
- out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n");
- out.append(" menus: " + menusJs() + ",\n");
- out.append(" elements: " + elementsJs() + "\n");
- out.append("};\n");
+ out.append("jQuery(document).ready(function() {\n");
+ out.append(" jQuery.mgnlAddContextMenu(" + ContextMenuElFunctions.editMessageInfosJs() + ");\n");
+ out.append("});\n");
out.append("</script>\n");
out.append("<!-- end contextmenu:scripts -->\n");
+
return out.toString();
}
return StringUtils.EMPTY;
@@ -118,10 +121,7 @@
ElementInfo info = (ElementInfo) item;
sb.append("'").append(info.getElementId()).append("'");
sb.append(":{");
- if (!StringUtils.isEmpty(info.getEntryName()))
- {
- sb.append("'entryName':'").append(info.getEntryName()).append("',");
- }
+
if (!StringUtils.isEmpty(info.getContextMenu()))
{
sb.append("'contextMenu':'").append(info.getContextMenu()).append("',");
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -0,0 +1,38 @@
+/**
+ *
+ * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontextmenu.tags;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions;
+
+
+public class SortItemTag extends BodyTagSupport
+{
+
+ @Override
+ public int doEndTag() throws JspException
+ {
+ ContextMenuElFunctions.addSortListItem(getBodyContent().getString());
+ return EVAL_BODY_BUFFERED;
+ }
+
+}
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-09-16 23:33:31 UTC (rev 4316)
@@ -0,0 +1,130 @@
+/**
+ *
+ * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcontextmenu.tags;
+
+import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.NestableRuntimeException;
+
+
+public class SortListTag extends TagSupport
+{
+
+ private String containerId;
+
+ private String orderProperty;
+
+ public void setContainerId(String containerId)
+ {
+ this.containerId = containerId;
+ }
+
+ public void setOrderProperty(String orderProperty)
+ {
+ this.orderProperty = orderProperty;
+ }
+
+ @Override
+ public int doStartTag() throws JspException
+ {
+ ContextMenuElFunctions.beginSortList();
+ return EVAL_BODY_INCLUDE;
+ }
+
+ @Override
+ public int doEndTag() throws JspException
+ {
+ if (StringUtils.isEmpty(orderProperty))
+ {
+ orderProperty = containerId;
+ }
+ String order = StringUtils.defaultString(NodeDataUtil.getString(MgnlContext
+ .getAggregationState()
+ .getCurrentContent(), orderProperty));
+
+ JspWriter out = pageContext.getOut();
+ try
+ {
+ for (Object item : ContextMenuElFunctions.endSortList(order))
+ {
+ out.print(item);
+ }
+ }
+ catch (IOException e)
+ {
+ throw new NestableRuntimeException(e);
+ }
+ boolean canEdit;
+ try
+ {
+ canEdit = NodeUtil.isGranted(
+ MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ Permission.SET);
+
+ }
+ catch (Throwable e)
+ {
+ canEdit = false;
+ }
+ if (canEdit)
+ {
+ Map<String, String> item = new HashMap<String, String>();
+ item.put("containerId", containerId);
+ item.put("url", MgnlContext.getContextPath() + "/mgnl-set-property");
+ item.put("path", MgnlContext.getAggregationState().getCurrentContent().getHandle());
+ item.put("name", orderProperty);
+ item.put("order", '[' + order + ']');
+ List items = (List) pageContext.getRequest().getAttribute("mgnlSortLists");
+ if (items == null)
+ {
+ items = new ArrayList();
+ pageContext.getRequest().setAttribute("mgnlSortLists", items);
+ }
+ items.add(item);
+ }
+ containerId = null;
+ orderProperty = null;
+ return EVAL_PAGE;
+ }
+
+ @Override
+ public void release()
+ {
+ super.release();
+ containerId = null;
+ orderProperty = null;
+ }
+}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-16 23:33:31 UTC (rev 4316)
@@ -64,6 +64,32 @@
<type>boolean</type>
</attribute>
</tag>
+ <tag>
+ <description></description>
+ <display-name>sortList</display-name>
+ <name>sortList</name>
+ <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.SortListTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description></description>
+ <name>containerId</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>orderProperty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <description></description>
+ <display-name>sortItem</display-name>
+ <name>sortItem</name>
+ <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.SortItemTag</tag-class>
+ <body-content>JSP</body-content>
+ </tag>
<function>
<description>
<![CDATA[Gets the entry value for the specified key, searching for it in the local and global contents
@@ -89,4 +115,35 @@
<function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
<function-signature>java.lang.String scripts()</function-signature>
</function>
+ <function>
+ <name>beginSortList</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>void beginSortList()</function-signature>
+ </function>
+ <function>
+ <name>addSortListItem</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>void addSortListItem(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>endSortList</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>java.util.List endSortList(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>addEditMessageInfo</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>net.sourceforge.openutils.mgnlcontextmenu.el.ElementInfo
+ addEditMessageInfo(java.lang.String, java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>editMessageInfos</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>java.util.List editMessageInfos()</function-signature>
+ </function>
+ <function>
+ <name>editMessageInfosJs</name>
+ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+ <function-signature>java.lang.String editMessageInfosJs()</function-signature>
+ </function>
</taglib>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="SetPropertyServlet" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>87516f73-b4d9-40e4-93fc-9012f4381c4b</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.filters.ServletDispatchingFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="servletClass" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontextmenu.servlet.SetPropertyServlet</sv:value>
+ </sv:property>
+ <sv:property sv:name="servletName" sv:type="String">
+ <sv:value>SetPropertyServlet</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-11-06T12:35:47.671+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-16T17:14:54.990+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="mappings">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>9428a424-1007-403e-b299-a6d1b66d306c</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>2008-11-06T12:35:47.671+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="-mgnl-set-property">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>058dc477-a183-4817-8e93-0fbb8332377c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="pattern" sv:type="String">
+ <sv:value>/mgnl-set-property</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-11-06T12:35:47.671+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-12-16T17:13:46.193+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="parameters">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>11433323-def8-4bab-a5b9-28c18b2fc9d9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-09-16T22:51:36.579+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T22:56:08.123+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -117,7 +117,7 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="hint">
+ <sv:node sv:name="help">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
</sv:property>
@@ -134,13 +134,13 @@
<sv:value>true</sv:value>
</sv:property>
<sv:property sv:name="icon" sv:type="String">
- <sv:value>/docroot/samples-contextmenu/ico16-form-hint.png</sv:value>
+ <sv:value>/docroot/samples-contextmenu/ico16-form-help.png</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="text" sv:type="String">
- <sv:value>Edit hint</sv:value>
+ <sv:value>Edit help</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -155,7 +155,7 @@
<sv:value>String</sv:value>
</sv:property>
<sv:property sv:name="value" sv:type="String">
- <sv:value>Field labels and hints are editable via context menu: just right click on the label of a form field.</sv:value>
+ <sv:value>Field labels and helps are editable via context menu: just right click on the label of a form field.</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-contextmenu-move-fields" 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>0dbd4630-67ef-45ed-9f90-a1c4868b7cfd</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T23:48:42.477+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabForm">
+ <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>6d09ffbd-d685-4824-b3dc-83606843a038</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Form</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T23:48:34.242+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="dummy">
+ <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>e385ff62-22d7-4645-ab1c-2e56496767a2</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hidden</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultValue" sv:type="String">
+ <sv:value>.</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T23:48:34.242+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="description">
+ <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>b4551617-bc5f-4f74-bfe5-0f088b00a3ac</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>static</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>String</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>Field position via context menu: just right click on the label of a form field.</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T23:49:11.424+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -10,7 +10,7 @@
<sv:value>9c276214-2a48-4113-aa4f-653ac07854cb</sv:value>
</sv:property>
<sv:property sv:name="description" sv:type="String">
- <sv:value>Sample paragraph showing a form where field labels and hints can be edited via context menu on labels.</sv:value>
+ <sv:value>Sample paragraph showing a form where field labels and helps can be edited via context menu on labels.</sv:value>
</sv:property>
<sv:property sv:name="dialog" sv:type="String">
<sv:value>contextmenu:samples-contextmenu-form</sv:value>
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samples-contextmenu-move-fields" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>3e2e98d0-9f7b-4a40-87d5-9ce58bfbffef</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Sample paragraph showing fields moved via context menu.</sv:value>
+ </sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>contextmenu:samples-contextmenu-move-fields</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/templates/samples-contextmenu/paragraph-move-fields.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Move fields sample (jsp)</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T23:44:14.391+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-16 10:55:46 UTC (rev 4315)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-16 23:33:31 UTC (rev 4316)
@@ -257,6 +257,43 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="samples-contextmenu-move-fields">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>b27daf20-3a65-4822-a317-8dc6f9a92c76</sv:value>
+ </sv:property>
+ <sv:property sv:name="id" sv:type="String">
+ <sv:value>contextmenu:components/samples-contextmenu-move-fields</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-03-21T07:32:14.200+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-09-16T23:46:11.009+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
<sv:node sv:name="samples-contextmenu-message-freemarker">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:contentNode</sv:value>
Modified: magnoliamodules/trunk/openutils-...
[truncated message content] |
