Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4248] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-05-20 09:43:20
|
Revision: 4248
http://openutils.svn.sourceforge.net/openutils/?rev=4248&view=rev
Author: fgiust
Date: 2013-05-20 09:43:15 +0000 (Mon, 20 May 2013)
Log Message:
-----------
templating magic, no more need for wrappers!
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -186,12 +186,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltagcloud</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+ <analyzers>
+ <analyzer class="org.apache.lucene.analysis.KeywordAnalyzer">
+ <property>tags</property>
+ </analyzer>
+ </analyzers>
+</configuration>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samplesCriteria" 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>a09f5032-bc54-4f8b-b011-111f922119f6</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>/template_criteria/criteria.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Sample Criteria</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-05-19T19:46:43.497+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samplesMagnoliaUtils" 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>da5823f7-dac4-4a6f-a769-a09e95601f44</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>info.magnolia.module.samples.messages</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>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Sample Magnoliautils</sv:value>
+ </sv:property>
+ <sv:property sv:name="titleSize" sv:type="String">
+ <sv:value>1</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-05-19T19:46:42.181+02:00</sv:value>
+ </sv:property>
+ </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>6dba0719-7b5c-4991-9eeb-4193a0b8b6db</sv:value>
+ </sv:property>
+ <sv:property sv:name="dummy" sv:type="String">
+ <sv:value>This parameter has been set in the template definition</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>2009-01-15T12:21:10.608+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-05-19T19:46:04.237+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesCriteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>aaf3511c-2084-4f54-9e5a-ba0fca2a58f0</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/template_criteria/criteria.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Sample Criteria</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-08-25T16:46:38.062+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesMagnoliaUtils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>1e213413-c125-4958-b8c5-350b88cbb39c</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>info.magnolia.module.samples.messages</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Sample Magnoliautils</sv:value>
- </sv:property>
- <sv:property sv:name="titleSize" sv:type="String">
- <sv:value>1</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T10:16:28.038+01:00</sv:value>
- </sv:property>
- </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:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>c971ec11-95dc-4547-9fad-ae0275ea3856</sv:value>
- </sv:property>
- <sv:property sv:name="dummy" sv:type="String">
- <sv:value>This parameter has been set in the template definition</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-15T12:12:06.690+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,7 +3,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -29,17 +29,17 @@
<sv:value>2010-08-25T16:28:31.718+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-08-25T16:48:30.468+02:00</sv:value>
+ <sv:value>2013-05-19T19:48:26.588+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesCriteria</sv:value>
+ <sv:value>samples:pages/samplesCriteria</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="pets">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -65,17 +65,17 @@
<sv:value>2010-05-13T11:04:10.640+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-13T11:04:22.468+02:00</sv:value>
+ <sv:value>2013-05-19T19:48:36.682+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>plaintext</sv:value>
+ <sv:value>standard-templating-kit:pages/stkArticle</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="cats">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -111,7 +111,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -154,7 +154,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -197,7 +197,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -240,7 +240,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -284,7 +284,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -320,7 +320,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -363,7 +363,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -406,7 +406,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -449,7 +449,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -493,7 +493,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -529,7 +529,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -573,7 +573,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -609,7 +609,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -653,7 +653,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -689,7 +689,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -732,7 +732,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -776,7 +776,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
@@ -812,7 +812,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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">
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,12 +3,15 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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>9854e9ac-0cde-4a3a-b019-e95a8634207c</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Magnolia Utils</sv:value>
</sv:property>
@@ -16,6 +19,9 @@
<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>
@@ -23,22 +29,25 @@
<sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:10:28.435+01:00</sv:value>
+ <sv:value>2013-05-19T19:47:38.973+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesMagnoliaUtils</sv:value>
+ <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="Magnolia-Utils">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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>ce2e0ee4-97bc-4a28-ab36-9283dd39af2e</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Magnolia Utils Test page 1</sv:value>
</sv:property>
@@ -46,6 +55,9 @@
<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>
@@ -56,22 +68,25 @@
<sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:43:05.416+01:00</sv:value>
+ <sv:value>2013-05-19T19:47:41.964+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesMagnoliaUtils</sv:value>
+ <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="Magnolia-Utils0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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>f064acbd-0eb1-44f8-b2a4-f561dd49c805</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Magnolia Utils Test page 1b</sv:value>
</sv:property>
@@ -79,6 +94,9 @@
<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>
@@ -89,10 +107,10 @@
<sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:43:10.650+01:00</sv:value>
+ <sv:value>2013-05-19T19:48:00.030+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesMagnoliaUtils</sv:value>
+ <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
</sv:property>
</sv:node>
</sv:node>
@@ -100,16 +118,22 @@
<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: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>7766ee9e-bcbe-4f8f-951f-07a57823f03c</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -124,12 +148,15 @@
<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: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>ef4fe54e-a6f9-4ab6-980a-2395a4a6e194</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="text" sv:type="String">
<sv:value><p><strong>Lorem Ipsum</strong> is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever si</p></sv:value>
</sv:property>
@@ -140,6 +167,9 @@
<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>
@@ -157,16 +187,22 @@
<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: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>7c158483-8813-47b5-b176-643694dbc857</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>2010-01-18T14:11:22.618+01:00</sv:value>
</sv:property>
@@ -179,12 +215,15 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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>e1285f01-769e-4791-b9de-afcb8771fdc8</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Magnolia Utils Test page 2</sv:value>
</sv:property>
@@ -192,6 +231,9 @@
<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>
@@ -202,10 +244,10 @@
<sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:42:59.901+01:00</sv:value>
+ <sv:value>2013-05-19T19:47:48.730+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesMagnoliaUtils</sv:value>
+ <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,12 +3,15 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <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>4b1defa2-e1f0-4051-a444-e855aa39c058</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="text" sv:type="String">
<sv:value><p>This sample shows how to use jsp template, how you can extend the Template class and add your own variables and how to define parameters that you can then use as request parameters.</p></sv:value>
</sv:property>
@@ -19,6 +22,9 @@
<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>
@@ -29,26 +35,32 @@
<sv:value>2009-01-16T09:26:04.050+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-02T19:50:56.540+02:00</sv:value>
+ <sv:value>2013-05-19T19:47:52.730+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>sampleSimpleMedia</sv:value>
+ <sv:value>media:pages/sampleSimpleMedia</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="text_files">
<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: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>c7024555-35bc-40e4-b1cb-081462176b3f</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>2009-01-16T09:56:40.411+01:00</sv:value>
</sv:property>
@@ -58,16 +70,22 @@
<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: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>f76ca2a8-67f4-4267-a57c-f7219e7b6d92</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -82,16 +100,22 @@
<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: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>a96e842c-3908-42ff-a854-c6f8bf31ecf7</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -127,6 +151,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2010-05-02T19:50:56.539+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>image/png</sv:value>
</sv:property>
@@ -145,16 +172,22 @@
<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: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>294b766b-8a2c-4b75-bb6f-42f09ff753d5</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -190,6 +223,9 @@
<sv:property sv:name="jcr:lastModified" sv:type="Date">
<sv:value>2010-05-02T11:22:26.102+02:00</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:lastModifiedBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:mimeType" sv:type="String">
<sv:value>image/jpeg</sv:value>
</sv:property>
@@ -208,12 +244,15 @@
<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: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>44b37952-a482-471b-9cbc-01df334a71e5</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="media" sv:type="String">
<sv:value>ad7e0745-ba39-448b-99ae-71ef39f8d45e</sv:value>
</sv:property>
@@ -227,6 +266,9 @@
<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>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -46,10 +46,10 @@
<priority value="INFO" />
</category>
<category name="info.magnolia.module.admininterface.commands.ActivationCommand">
- <priority value="DEBUG" />
+ <priority value="INFO" />
</category>
<category name="info.magnolia.cms.i18n.AbstractMessagesImpl">
- <priority value="DEBUG" />
+ <priority value="INFO" />
</category>
<category name="it.openutils.mgnlutils.el">
<priority value="DEBUG" />
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,112 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mgnl="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:su="http://openutils.sf.net/openutils-stringutils"
+ xmlns:mu="mgnlutils" xmlns:du="dateutils" xmlns:el="project">
+ <c:if test="${mu:systemProperty('magnolia.develop') or param.debug eq '42'}">
+ <div id="debugpanel">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <tr>
+ <td>request URI</td>
+ <td>${pageContext.request.requestURI}</td>
+ </tr>
+ <tr>
+ <td>state</td>
+ <td>${state}</td>
+ </tr>
+ <tr>
+ <td>state.handle</td>
+ <td>${state.handle}</td>
+ </tr>
+ <tr>
+ <td>state.repository</td>
+ <td>${state.repository}</td>
+ </tr>
+ <tr>
+ <td>state.templateName</td>
+ <td>${state.templateName}</td>
+ </tr>
+ <tr>
+ <td>state.locale</td>
+ <td>${state.locale}</td>
+ </tr>
+ <tr>
+ <td>state.channel.name</td>
+ <td>${state.channel.name}</td>
+ </tr>
+ <tr>
+ <td>state.currentURI</td>
+ <td>${state.currentURI}</td>
+ </tr>
+ <tr>
+ <td>state.originalURL</td>
+ <td>${state.originalURL}</td>
+ </tr>
+ <tr>
+ <td>state.originalURI</td>
+ <td>${state.originalURI}</td>
+ </tr>
+<!-- <tr>
+ <td>state.mainContent</td>
+ <td>${state.mainContent} ${state.mainContent.class}</td>
+ </tr>-->
+<!-- <tr>
+ <td>state.mainContent.JCRNode</td>
+ <td>${state.mainContent.JCRNode} ${state.mainContent.JCRNode.class}</td>
+ </tr>-->
+ <tr>
+ <td>state.mainContent.JCRNode.identifier</td>
+ <td>${state.mainContent.JCRNode.identifier}</td>
+ </tr>
+ <tr>
+ <td>state.currentContent</td>
+ <td>${state.currentContent}</td>
+ </tr>
+ <tr>
+ <td>content</td>
+ <td>${content} content.title: ${content.title} id: ${content['@id']} name: ${content['@name']} depth:
+ ${content['@depth']} path: ${content['@path']} nodeType: ${content['@nodeType'].name}
+ </td>
+ </tr>
+ <tr>
+ <td>def</td>
+ <td>${def}</td>
+ </tr>
+ <tr>
+ <td>model</td>
+ <td>${model}</td>
+ </tr>
+<!-- <tr>
+ <td>model.node</td>
+ <td>${model.node} ${model.node.class} ${model.node.name} ${model.node}</td>
+ </tr>-->
+ <tr>
+ <td>model.content</td>
+ <td>${model.content}</td>
+ </tr>
+ <tr>
+ <td>model.def</td>
+ <td>${model.def}</td>
+ </tr>
+ <tr>
+ <td>cmsfn</td>
+ <td>${cmsfn}</td>
+ </tr>
+ <tr>
+ <td>request attr</td>
+ <td>
+ <table>
+ <c:forEach items="${pageContext.request.attributeNames}" var="attr">
+ <c:if test="${attr ne 'org.springframework.core.convert.ConversionService'}">
+ <tr>
+ <td>${attr}</td>
+ <td>${requestScope[attr]}</td>
+ </tr>
+ </c:if>
+ </c:forEach>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </c:if>
+</jsp:root>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd" version="2.5">
<description>Magnolia</description>
<display-name>magnolia</display-name>
<distributable />
@@ -60,7 +60,7 @@
<url-pattern>/do/*</url-pattern>
</servlet-mapping>
<listener>
- <listener-class>info.magnolia.cms.servlets.MgnlServletContextListener</listener-class>
+ <listener-class>info.magnolia.init.MagnoliaServletContextListener</listener-class>
</listener>
<jsp-config>
<jsp-property-group>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp 2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,168 +1,356 @@
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+ xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+<![CDATA[
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<%@ page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"
-%> <%@ taglib prefix="cms" uri="cms-taglib" %> <%@ taglib prefix="cmsu" uri="cms-util-taglib" %> <%@ taglib prefix="mu"
-uri="mgnlutils" %>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>
- <cms:ifNotEmpty nodeDataName="title">${content.title}</cms:ifNotEmpty>
- <cms:ifEmpty nodeDataName="title"><cms:out nodeDataName="name" /></cms:ifEmpty>
- </title>
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/docroot/samples/samples.css" />
- <cms:links />
- <style>
- .function {
- border: 1px solid #ccc;
- padding: 20px;
- }
- .sampleresult {
- color: red;
- }
- * {
- font-family: tahoma, verdana, arial;
- }
- p{
- color: blue;
- }
- </style>
- </head>
- <body>
-
- <!-- Page Dialog -->
- <cms:mainBar dialog="mainProperties" />
- <div id="header">
- <h1>Magnolia Utils Samples</h1>
- </div>
-
- <!-- Simple Navigation Tag -->
- <div id="navigation">
- <cmsu:simpleNavigation />
- </div>
- <div id="main">
+]]>
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title> ${content.title}
+ </title>
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/css/bootstrap.min.css" />
+ <style>
+ <![CDATA[
+ code { display: block}
+ ]]>
+ </style>
+ <cms:init />
+ </head>
+ <body>
+ <div id="main" class="container">
+ <div id="header">
+ <h1>Magnolia Utils Samples</h1>
+ </div>
+ <c:set var="oldcontent" value="${state.currentContent}" />
+ <c:set var="contentMap" value="${content}" />
+ <c:set var="node" value="${oldcontent.JCRNode}" />
+ <table class="table table-striped table-bordered table-hover">
+ <thead>
+ <tr>
+ <th>Property</th>
+ <th>Node</th>
+ <th>ContentMap</th>
+ <th>Content</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th><!-- -->
+ </th>
+ <td>${node}
+ </td>
+ <td>${contentMap}
+ </td>
+ <td>${oldcontent}
+ </td>
+ </tr>
+ <tr>
+ <th>class
+ </th>
+ <td>${node.class.name}
+ </td>
+ <td>${contentMap.class.name }
+ </td>
+ <td>${oldcontent.class.name}
+ </td>
+ </tr>
+ <tr>
+ <th>UUID
+ </th>
+ <td>${node.UUID}
+ </td>
+ <td>${contentMap.UUID}
+ </td>
+ <td>${oldcontent.UUID}
+ </td>
+ </tr>
+ <tr>
+ <th>@uuid
+ </th>
+ <td>${node['@uuid']}
+ </td>
+ <td>${contentMap['@uuid']}
+ </td>
+ <td>${oldcontent['@uuid']}
+ </td>
+ </tr>
+ <tr>
+ <th>@UUID
+ </th>
+ <td>${node['@UUID']}
+ </td>
+ <td>${contentMap['@UUID']}
+ </td>
+ <td>${oldcontent['@UUID']}
+ </td>
+ </tr>
+ <tr>
+ <th>@id
+ </th>
+ <td>${node['@id']}
+ </td>
+ <td>${contentMap['@id']}
+ </td>
+ <td>${oldcontent['@id']}
+ </td>
+ </tr>
+ <tr>
+ <th>handle
+ </th>
+ <td>${node.handle}
+ </td>
+ <td>${contentMap.handle}
+ </td>
+ <td>${oldcontent.handle}
+ </td>
+ </tr>
+ <tr>
+ <th>path
+ </th>
+ <td>${node.path}
+ </td>
+ <td>${contentMap.path}
+ </td>
+ <td>${oldcontent.path}
+ </td>
+ </tr>
+ <tr>
+ <th>@handle
+ </th>
+ <td>${node['@handle']}
+ </td>
+ <td>${contentMap['@handle']}
+ </td>
+ <td>${oldcontent['@handle']}
+ </td>
+ </tr>
+ <tr>
+ <th>@path
+ </th>
...
[truncated message content] |
