Author: marijan
Date: Sat Sep 15 16:31:09 2012
New Revision: 1385115
URL: http://svn.apache.org/viewvc?rev=1385115&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- add freemarker pages into repostory
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json?rev=1385115&r1=1385114&r2=1385115&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
Sat Sep 15 16:31:09 2012
@@ -6,7 +6,7 @@
"parent":"/",
"importBehavior":"merge"
},
- "pagedata":{
+ "pages":{
"file":"initial-data.json",
"parent":"/",
"importBehavior":"merge"
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json?rev=1385115&r1=1385114&r2=1385115&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json
Sat Sep 15 16:31:09 2012
@@ -1,15 +1,81 @@
{
"jcr:primaryType":"ravedata:folder",
- "mypage.ftl":{
+ "taglibs.ftl":{
"jcr:primaryType":"ravedata:binary",
"id":"freemarker",
"resource":{
"jcr:primaryType":"ravedata:resource",
"jcr:lastModifiedBy":"admin",
-
"jcr:binary:jcr:data":"PCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPCNhc3NpZ24gcmF2ZT1Kc3BUYWdsaWJzWyJodHRwOi8vd3d3LmFwYWNoZS1yYXZlLm9yZy9qc3AvY29yZSJdIC8+CjxodG1sPgoKPGJvZHk+CjxoMT5teSBmcmVlbWFya2VyIHBhZ2UgZnJvbSBKQ1I8L2gxPgo8dGFibGUgYm9yZGVyPSIxIj4KICAgIDx0cj4KICAgICAgICA8dGQ+aGVhZAogICAgICAgIDxAcmF2ZS5pbmNsdWRlIHJlZj0iaGVhZCIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgogICAgPHRyPgogICAgICAgIDx0ZD5ib2R5CiAgICAgICAgPEByYXZlLmluY2x1ZGUgcmVmPSJib2R5Ii8+CiAgICAgICAgPC90ZD4KICAgIDwvdHI+CiAgICA8dHI+CiAgICAgICAgPHRkPiBmb290ZXIKICAgICAgICA8QHJhdmUuaW5jbHVkZSByZWY9ImZvb3RlciIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgo8L3RhYmxlPgo8L2JvZHk+CjwvaHRtbD4KCg==",
+
"jcr:binary:jcr:data":"PCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPCNhc3NpZ24gcmF2ZWhtdmM9SnNwVGFnbGlic1siaHR0cDovL3d3dy5hcGFjaGUtcmF2ZS5vcmcvanNwL2htdmMiXSAvPgo8I2Fzc2lnbiB0aWxlcz1Kc3BUYWdsaWJzWyJodHRwOi8vdGlsZXMuYXBhY2hlLm9yZy90YWdzLXRpbGVzIl0gLz4KPCNhc3NpZ24gcG9ydGFsPUpzcFRhZ2xpYnNbImh0dHA6Ly93d3cuYXBhY2hlLm9yZy9yYXZlL3RhZ3MiXSAvPgo8I2Fzc2lnbiBzZWM9SnNwVGFnbGlic1siaHR0cDovL3d3dy5zcHJpbmdmcmFtZXdvcmsub3JnL3NlY3VyaXR5L3RhZ3MiXSAvPgo8I2Fzc2lnbiBjPUpzcFRhZ2xpYnNbImh0dHA6Ly9qYXZhLnN1bi5jb20vanNwL2pzdGwvY29yZSJdIC8+CjwjYXNzaWduIGZtdD1Kc3BUYWdsaWJzWyJodHRwOi8vamF2YS5zdW4uY29tL2pzcC9qc3RsL2ZtdCJdIC8+CjwjYXNzaWduIGZuPUpzcFRhZ2xpYnNbImh0dHA6Ly9qYXZhLnN1bi5jb20vanNwL2pzdGwvZnVuY3Rpb25zIl0gLz4KPCNhc3NpZ24gZm9ybT1Kc3BUYWdsaWJzWyJodHRwOi8vd3d3LnNwcmluZ2ZyYW1ld29yay5vcmcvdGFncy9mb3JtIl0gLz4=",
"jcr:encoding":"test",
- "jcr:mimeType":"image/png",
+ "jcr:mimeType":"text/plain",
"jcr:lastModified":"2012-08-30T10:48:40.534+0200"
}
+ },
+ "footer.ftl":{
+ "jcr:primaryType":"ravedata:binary",
+ "id":"freemarker",
+ "resource":{
+ "jcr:primaryType":"ravedata:resource",
+ "jcr:lastModifiedBy":"admin",
+
"jcr:binary:jcr:data":"PCMtLSBAZnRsdmFyaWFibGUgbmFtZT0iYXBwbGljYXRpb25Qcm9wZXJ0aWVzIiB0eXBlPSJqYXZhLnV0aWwuTWFwIiAtLT4KPCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPGZvb3Rlcj4KICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICAgICAgPGRpdiBjbGFzcz0icm93Ij4KICAgICAgICAgICAgPGRpdiBjbGFzcz0ic3BhbjEyIHZlcnNpb24iPgogICAgICAgICAgICAgICAgPHNwYW4+QXBhY2hlIFJhdmUgJHthcHBsaWNhdGlvblByb3BlcnRpZXNbJ3BvcnRhbC52ZXJzaW9uJ119PC9zcGFuPgogICAgICAgICAgICAgICAgPGEgaHJlZj0iaHR0cDovL3JhdmUuYXBhY2hlLm9yZyI+PGltZyBjbGFzcz0iZm9vdGVyLWxvZ28iIGFsdD0iQXBhY2hlIFJhdmUiIHRpdGxlPSJBcGFjaGUgUmF2ZSIgc3JjPSI8QHNwcmluZy51cmwgJy9zdGF0aWMvaW1hZ2VzL3JhdmUtbG9nby5wbmcnLz4iLz48L2E+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAgIDwvZGl2PgogICAgPC9kaXY+CjwvZm9vdGVyPg==",
+ "jcr:encoding":"test",
+ "jcr:mimeType":"text/plain",
+ "jcr:lastModified":"2012-08-30T10:48:40.534+0200"
+ }
+ },
+ "userpage":{
+ "jcr:primaryType":"ravedata:folder",
+ "page.ftl":{
+ "jcr:primaryType":"ravedata:binary",
+ "id":"freemarker",
+ "resource":{
+ "jcr:primaryType":"ravedata:resource",
+ "jcr:lastModifiedBy":"admin",
+
"jcr:binary:jcr:data":"PCNpbmNsdWRlICIuLi90YWdsaWJzLmZ0bCIvPgo8I2ltcG9ydCAiLi4vbWFjcm9zL21ldGFEYXRhLmZ0bCIgYXMgbWV0YS8+CjwjaW1wb3J0ICIuLi9tYWNyb3MvY3NzLmZ0bCIgYXMgY3NzLz4KPCNpbXBvcnQgIi4uL21hY3Jvcy9yYXZlSnMuZnRsIiBhcyByYXZlSmF2YXNjcmlwdC8+CjwhRE9DVFlQRSBodG1sPgo8aHRtbCBjbGFzcz0ibm8tanMiPgo8aGVhZD4KPEBtZXRhLm1ldGFEYXRhIC8+CiAgICA8dGl0bGU+cmF2ZTwvdGl0bGU+CjxAY3NzLmNzc0ZpbGVzLz4KICAgIDxzY3JpcHQgc3JjPSIvL2NkbmpzLmNsb3VkZmxhcmUuY29tL2FqYXgvbGlicy9tb2Rlcm5penIvMi41LjMvbW9kZXJuaXpyLm1pbi5qcyI+PC9zY3JpcHQ+CjwvaGVhZD4KPGJvZHk+CjxpbnB1dCBpZD0iY3VycmVudFBhZ2VJZCIgdHlwZT0iaGlkZGVuIiB2YWx1ZT0iJHtwYWdlLmlkfSIvPgo8Iy0tIEhlYWRlciBDb250ZW50IC0tPgo8QHJhdmVobXZjLmluY2x1ZGUgcmVmPSJoZWFkZXIiLz4KPCMtLSBNYWluIEJvZHkgQ29udGVudCAtLT4KPEByYXZlaG12Yy5pbmNsdWRlIHJlZj0iYm9keSIvPgo8Iy0tIEZvb3RlciBDb250ZW50IC0tPgo8QHJhdmVobXZjLmluY2x1ZGUgcmVmPSJmb290ZXIiLz4KPCMtLSByZW5kZXIgYW55IHNjcmlwdCB0aGF0IG5lZWRzIHRvIGV4ZWN1dGUgcHJlLXNyYyBpbmNsdWRlcyAtLT4KPCMtLTxAcG9ydGFsWyJyZWdpc3Rlci1pbml0LXNjcmlwdC
Bsb2NhdGlvbiJdIGxvY2F0aW9uPSIkeydCRUZPUkVfUkFWRSd9Ii8+LS0+CjwjLS0gcmVuZGVyIHRoZSBqYXZhc2NyaXB0IHNyYyBpbmNsdWRlcyBhdCB0aGUgYm90dG9tIG9mIHRoZSBwYWdlIGZvciBwZXJmb3JtYW5jZSAtLT4KPEByYXZlSmF2YXNjcmlwdC5yYXZlSmF2YXNjcmlwdC8+CjwjLS0gcmVuZGVyIGN1c3RvbSBqYXZhc2NyaXB0IGZyb20gZXh0ZW5zaW9uIHByb2plY3RzIGlmIHRoZSB0YWcgaXMgb3ZlcmxheWVkIC0tPgoKPCMtLSByZW5kZXIgYW55IHNjcmlwdCB0aGF0IG5lZWRzIHRvIGV4ZWN1dGUgcG9zdC1zcmMgaW5jbHVkZXMgLS0+CjwjLS08QHBvcnRhbFsicmVuZGVyLWluaXQtc2NyaXB0Il0gbG9jYXRpb249IiR7J0FGVEVSX1JBVkUnfSIvPi0tPgo8L2JvZHk+CjwvaHRtbD4K",
+ "jcr:encoding":"test",
+ "jcr:mimeType":"text/plain",
+ "jcr:lastModified":"2012-08-30T10:48:40.534+0200"
+ }
+ }
+ },
+ "macros":{
+ "jcr:primaryType":"ravedata:folder",
+ "css.ftl":{
+ "jcr:primaryType":"ravedata:binary",
+ "id":"freemarker",
+ "resource":{
+ "jcr:primaryType":"ravedata:resource",
+ "jcr:lastModifiedBy":"admin",
+
"jcr:binary:jcr:data":"PCNpbmNsdWRlICIuLi90YWdsaWJzLmZ0bCIvPgo8I21hY3JvIGNzc0ZpbGVzPgo8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii8vYWpheC5hc3BuZXRjZG4uY29tL2FqYXgvanF1ZXJ5LnVpLzEuOC4xNy90aGVtZXMvYmFzZS9qcXVlcnktdWkuY3NzIi8+CjxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iPEBzcHJpbmcudXJsICIvc3RhdGljL2Nzcy9yYXZlLmNzcyIgLz4iLz4KPC8jbWFjcm8+",
+ "jcr:encoding":"test",
+ "jcr:mimeType":"text/plain",
+ "jcr:lastModified":"2012-08-30T10:48:40.534+0200"
+ }
+ },
+ "raveJs.ftl":{
+ "jcr:primaryType":"ravedata:binary",
+ "id":"freemarker",
+ "resource":{
+ "jcr:primaryType":"ravedata:resource",
+ "jcr:lastModifiedBy":"admin",
+
"jcr:binary:jcr:data":"PCNpbmNsdWRlICIuLi90YWdsaWJzLmZ0bCIvPgo8I21hY3JvIHJhdmVKYXZhc2NyaXB0PgoKPHNjcmlwdCBzcmM9Ii8vY2RuanMuY2xvdWRmbGFyZS5jb20vYWpheC9saWJzL2pzb24yLzIwMTEwMjIzL2pzb24yLmpzIj48L3NjcmlwdD4KPHNjcmlwdCBzcmM9Ii8vYWpheC5hc3BuZXRjZG4uY29tL2FqYXgvanF1ZXJ5L2pxdWVyeS0xLjcuMi5taW4uanMiPjwvc2NyaXB0Pgo8c2NyaXB0IHNyYz0iLy9hamF4LmFzcG5ldGNkbi5jb20vYWpheC9qcXVlcnkudWkvMS44LjE3L2pxdWVyeS11aS5taW4uanMiPjwvc2NyaXB0Pgo8c2NyaXB0IHNyYz0iLy9hamF4LmFzcG5ldGNkbi5jb20vYWpheC9qcXVlcnkudmFsaWRhdGUvMS44LjEvanF1ZXJ5LnZhbGlkYXRlLm1pbi5qcyI+PC9zY3JpcHQ+CjxzY3JpcHQgc3JjPSIvL2NkbmpzLmNsb3VkZmxhcmUuY29tL2FqYXgvbGlicy9qcXVlcnktaGFzaGNoYW5nZS92MS4zL2pxdWVyeS5iYS1oYXNoY2hhbmdlLm1pbi5qcyI+PC9zY3JpcHQ+Cgo8c2NyaXB0IHNyYz0iLy9jZG5qcy5jbG91ZGZsYXJlLmNvbS9hamF4L2xpYnMvdHdpdHRlci1ib290c3RyYXAvMi4wLjMvYm9vdHN0cmFwLm1pbi5qcyI+PC9zY3JpcHQ+CjwhLS1baWYgbHQgSUUgOV0+PHNjcmlwdCBzcmM9Ii8vY3NzMy1tZWRpYXF1ZXJpZXMtanMuZ29vZ2xlY29kZS5jb20vc3ZuL3RydW5rL2NzczMtbWVkaWFxdWVyaWVzLmpzIj48L3NjcmlwdD48IVtlbm
RpZl0tLT4KICAgIDwjYXNzaWduIGpzRGVidWdNb2RlPgogICAgICAgIDxAcG9ydGFsWydyZW5kZXItanMtZGVidWctbW9kZSddLz4KICAgIDwvI2Fzc2lnbj4KCiAgICA8I2lmIGpzRGVidWdNb2RlID09IDE+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJpbmcudXJsICIvc3RhdGljL3NjcmlwdC9yYXZlLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfYXBpLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfb3BlbnNvY2lhbC5qcyIvPiI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJpbmcudXJsICIvc3RhdGljL3NjcmlwdC9yYXZlX3dvb2tpZS5qcyIvPiI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJpbmcudXJsICIvc3RhdGljL3NjcmlwdC9yYXZlX2xheW91dC5qcyIvPiI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJpbmcudXJsICIvc3RhdGljL3NjcmlwdC9yYXZlX2Zvcm1zLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfcGVyc29uX3Byb2ZpbGUuanMiLz4iPjwvc2NyaXB0PgogICAgPHNjcmlwdCBzcmM9IjxAc3ByaW5nLnVybCAiL3N0YXRpYy9zY3JpcHQvcmF2ZV9zdG9yZS5qcyIvPiI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJ
pbmcudXJsICIvc3RhdGljL3NjcmlwdC9yYXZlX2FkbWluLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfYWxsLm1pbi5qcyIvPiI+PC9zY3JpcHQ+CgogICAgPCNlbHNlPgogICAgPHNjcmlwdCBzcmM9IjxAc3ByaW5nLnVybCAiL2FwcC9tZXNzYWdlYnVuZGxlL3JhdmVfY2xpZW50X21lc3NhZ2VzLmpzIi8+Ij48L3NjcmlwdD4KICAgIDwvI2lmPgoKCgoKPHNjcmlwdD4KCiAgICByYXZlLnNldENvbnRleHQoIjxAc3ByaW5nLnVybCAiL2FwcC8iIC8+Iik7CiAgICByYXZlLnNldEphdmFTY3JpcHREZWJ1Z01vZGUoJHtqc0RlYnVnTW9kZX0pOwogICAgICAgIDxAc2VjLmF1dGhvcml6ZSBhY2Nlc3M9ImlzQXV0aGVudGljYXRlZCgpIj4KICAgICAgICAgICAgPEBzZWMuYXV0aGVudGljYXRpb24gcHJvcGVydHk9InByaW5jaXBhbC51c2VybmFtZSIgc2NvcGU9InJlcXVlc3QiIHZhcj0idXNlcm5hbWUiLz4KICAgICAgICAgICAgPEBzZWMuYXV0aGVudGljYXRpb24gcHJvcGVydHk9InByaW5jaXBhbC5pZCIgc2NvcGU9InJlcXVlc3QiIHZhcj0iaWQiLz4KICAgICAgICByYXZlLnNldFBhZ2VWaWV3ZXIoe3VzZXJuYW1lOiIke3VzZXJuYW1lfSIsIGlkOiIke2lkfSJ9KTsKICAgICAgICA8L0BzZWMuYXV0aG9yaXplPgo8L3NjcmlwdD4KCjwjLS0KCgo8JS0tIGNvbW1vbiBqYXZhc2NyaXB0IHRvIGV4ZWN1dGUgb24gYWxsIHBhZ2VzIC0t
JT4KCi0tPgoKPC8jbWFjcm8+Cg==",
+ "jcr:encoding":"test",
+ "jcr:mimeType":"text/plain",
+ "jcr:lastModified":"2012-08-30T10:48:40.534+0200"
+ }
+ },
+ "metaData.ftl":{
+ "jcr:primaryType":"ravedata:binary",
+ "id":"freemarker",
+ "resource":{
+ "jcr:primaryType":"ravedata:resource",
+ "jcr:lastModifiedBy":"admin",
+
"jcr:binary:jcr:data":"PCNtYWNybyBtZXRhRGF0YT4KPG1ldGEgY2hhcnNldD0iSVNPLTg4NTktMSIvPgo8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoIi8+CjwvI21hY3JvPgo=",
+ "jcr:encoding":"test",
+ "jcr:mimeType":"text/plain",
+ "jcr:lastModified":"2012-08-30T10:48:40.534+0200"
+ }
+ }
}
}
\ No newline at end of file