Author: ate
Date: Thu Sep 20 06:55:12 2012
New Revision: 1387876
URL: http://svn.apache.org/viewvc?rev=1387876&view=rev
Log:
RAVE-696: fix jcr import content, jcr:createdBy property is reserved
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/template-data.json
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/template-data.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/template-data.json?rev=1387876&r1=1387875&r2=1387876&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/resources/template-data.json
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/resources/template-data.json
Thu Sep 20 06:55:12 2012
@@ -1,12 +1,10 @@
{
"jcr:primaryType" : "ravedata:folder",
- "jcr:createdBy" : "admin",
"taglibs.ftl" : {
"jcr:primaryType" : "ravedata:script",
"ravedata:type" : "freemarker",
"jcr:lastModifiedBy" : "admin",
"id" : "freemarker",
- "jcr:createdBy" : "admin",
"jcr:encoding" : "test",
"jcr:mimeType" : "text/plain",
"ravedata:src" : "<#import \"/spring.ftl\" as spring />\n <#assign
ravehmvc=JspTaglibs[\"http://www.apache-rave.org/jsp/hmvc\";] />\n <#assign
tiles=JspTaglibs[\"http://tiles.apache.org/tags-tiles\";] />\n <#assign
portal=JspTaglibs[\"http://www.apache.org/rave/tags\";] />\n <#assign
sec=JspTaglibs[\"http://www.springframework.org/security/tags\";] />\n <#assign
c=JspTaglibs[\"http://java.sun.com/jsp/jstl/core\";] />\n <#assign
fmt=JspTaglibs[\"http://java.sun.com/jsp/jstl/fmt\";] />\n <#assign
fn=JspTaglibs[\"http://java.sun.com/jsp/jstl/functions\";] />\n <#assign
form=JspTaglibs[\"http://www.springframework.org/tags/form\";] />",
@@ -17,7 +15,6 @@
"ravedata:type" : "freemarker",
"jcr:lastModifiedBy" : "admin",
"id" : "footer",
- "jcr:createdBy" : "admin",
"jcr:encoding" : "test",
"jcr:mimeType" : "text/plain",
"ravedata:src" : "<#import \"/spring.ftl\"as spring/>\n<#assign
ravejcr=JspTaglibs[\"http://www.apache-rave.org/jsp/jcr\"]/>\n<#assign
c=JspTaglibs[\"http://java.sun.com/jsp/jstl/core\";] />\n<footer>\n <div
class=\"container\">\n <div class=\"row\">\n <div
class=\"span12 version\">\n <@ravejcr.content
path=\"/content/documents/rave.txt\" type=\"Article\" var=\"raveArticle\"/>\n
<span>${raveArticle.title}
${applicationProperties['portal.version']}</span>\n <a
href=\"http://rave.apache.org\";><img class=\"footer-logo\" alt=\"Apache Rave\"
title=\"Apache Rave\" src=\"<@c.url
value=\"/dyn/binaries/images/rave-logo.png\"/>\"/></a>\n </div>\n
</div>\n </div>\n</footer>",
@@ -25,13 +22,11 @@
},
"userpage" : {
"jcr:primaryType" : "ravedata:folder",
- "jcr:createdBy" : "admin",
"page.ftl" : {
"jcr:primaryType" : "ravedata:script",
"ravedata:type" : "freemarker",
"jcr:lastModifiedBy" : "admin",
"id" : "userpage",
- "jcr:createdBy" : "admin",
"jcr:encoding" : "test",
"ravedata:src" : "<#include \"../taglibs.ftl\"/> \n<#import
\"../macros/metaData.ftl\" as meta/>\n <#import \"../macros/css.ftl\" as
css/>\n <#import \"../macros/raveJs.ftl\" as raveJavascript/>\n <!DOCTYPE
html>\n <html class=\"no-js\">\n <head>\n <@meta.metaData />\n
<title>rave</title>\n <@css.cssFiles/>\n <script
src=\"//cdnjs.cloudflare.com/ajax/libs/modernizr/2.5.3/modernizr.min.js\"></script>\n
</head>\n <body>\n <input id=\"currentPageId\" type=\"hidden\"
value=\"${page.id}\"/>\n <#-- Header Content -->\n <@ravehmvc.include
ref=\"header\"/>\n <#-- Main Body Content -->\n <@ravehmvc.include
ref=\"body\"/>\n <#-- Footer Content -->\n <@ravehmvc.include
ref=\"footer\"/>\n <#assign
ScriptLocation=enums[\"org.apache.rave.portal.web.renderer.ScriptLocation\"]/>\n
<#-- render any script that needs to execute pre-src includes -->\n
<@portal[\"register-init-script\"] location=ScriptLocation.BEFORE_RAVE />\n
<#-- render the javascript src includes at the bottom of
the page for performance -->\n <@raveJavascript.raveJavascript/>\n <#-- render
custom javascript from extension projects if the tag is overlayed -->\n <#--
render any script that needs to execute post-src includes -->\n
<@portal[\"render-init-script\"] location=ScriptLocation.AFTER_RAVE />\n
</body>\n </html>",
"jcr:mimeType" : "text/plain",
@@ -40,13 +35,11 @@
},
"macros" : {
"jcr:primaryType" : "ravedata:folder",
- "jcr:createdBy" : "admin",
"css.ftl" : {
"jcr:primaryType" : "ravedata:script",
"ravedata:type" : "freemarker",
"jcr:lastModifiedBy" : "admin",
"id" : "macros",
- "jcr:createdBy" : "admin",
"jcr:encoding" : "test",
"jcr:mimeType" : "text/plain",
"ravedata:src" : "\n <#include \"../taglibs.ftl\"/>\n <#macro
cssFiles>\n <link rel=\"stylesheet\"
href=\"//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/themes/base/jquery-ui.css\"/>\n
<link rel=\"stylesheet\" href=\"<@spring.url \"/static/css/rave.css\" />\"/>\n
</#macro>",
@@ -57,7 +50,6 @@
"ravedata:type" : "freemarker",
"jcr:lastModifiedBy" : "admin",
"id" : "raveJs",
- "jcr:createdBy" : "admin",
"jcr:encoding" : "test",
"jcr:mimeType" : "text/plain",
"ravedata:src" : "<#include \"../taglibs.ftl\"/>\n <#macro
raveJavascript>\n <#assign
ScriptLocation=enums[\"org.apache.rave.portal.web.renderer.ScriptLocation\"]/>\n
<@portal[\"render-script\"] location=ScriptLocation.BEFORE_LIB />\n <script
src=\"//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js\"></script>\n
<script
src=\"//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min.js\"></script>\n
<script
src=\"//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min.js\"></script>\n
<script
src=\"//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js\"></script>\n
<script
src=\"//cdnjs.cloudflare.com/ajax/libs/jquery-hashchange/v1.3/jquery.ba-hashchange.min.js\"></script>\n
<script
src=\"//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.3/bootstrap.min.js\"></script>\n
<!--[if lt IE 9]><script
src=\"//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js\"></script><![endif]-->\n
<@portal[\"render-script\"] location=ScriptLocati
on.AFTER_LIB />\n <@portal[\"render-script\"]
location=ScriptLocation.BEFORE_RAVE />\n <#assign jsDebugMode>\n
<@portal['render-js-debug-mode']/>\n </#assign>\n <#if jsDebugMode == '1'>\n
<script src=\"<@spring.url \"/static/script/rave.js\"/>\"></script>\n <script
src=\"<@spring.url \"/static/script/rave_api.js\"/>\"></script>\n <script
src=\"<@spring.url \"/static/script/rave_opensocial.js\"/>\"></script>\n
<script src=\"<@spring.url \"/static/script/rave_wookie.js\"/>\"></script>\n
<script src=\"<@spring.url \"/static/script/rave_layout.js\"/>\"></script>\n
<script src=\"<@spring.url \"/static/script/rave_forms.js\"/>\"></script>\n
<script src=\"<@spring.url
\"/static/script/rave_person_profile.js\"/>\"></script>\n <script
src=\"<@spring.url \"/static/script/rave_store.js\"/>\"></script>\n <script
src=\"<@spring.url \"/static/script/rave_admin.js\"/>\"></script>\n <#else>\n
<script src=\"<@spring.url \"/static/script/rave_all.min.js\"/>\"></script>\n
</#if>\n <script src=
\"<@spring.url \"/app/messagebundle/rave_client_messages.js\"/>\"></script>\n
<@portal[\"render-script\"] location=ScriptLocation.AFTER_RAVE />\n <#-- common
javascript to execute on all pages -->\n <script>\n <#if requestContext??>\n
rave.setContext(\"${requestContext.pathToServlet}/\");\n <#else>\n
rave.setContext(\"<@spring.url \"/app/\" />\");\n </#if>\n
rave.setJavaScriptDebugMode(${jsDebugMode});\n <@sec.authorize
access=\"isAuthenticated()\">\n <@sec.authentication
property=\"principal.username\" scope=\"request\" var=\"username\"/>\n
<@sec.authentication property=\"principal.id\" scope=\"request\" var=\"id\"/>\n
rave.setPageViewer({username:\"${username}\", id:\"${id}\"});\n
</@sec.authorize>\n </script>\n </#macro>",
@@ -68,7 +60,6 @@
"ravedata:type" : "freemarker",
"jcr:lastModifiedBy" : "admin",
"id" : "metadata",
- "jcr:createdBy" : "admin",
"jcr:encoding" : "test",
"jcr:mimeType" : "text/plain",
"ravedata:src" : "<#macro metaData>\n<meta
charset=\"ISO-8859-1\"/>\n<meta name=\"viewport\"
content=\"width=device-width\"/>\n</#macro>",
