Author: marijan
Date: Sat Sep 15 16:31:33 2012
New Revision: 1385118
URL: http://svn.apache.org/viewvc?rev=1385118&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- fix freemarker macro
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json
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=1385118&r1=1385117&r2=1385118&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:33 2012
@@ -18,7 +18,7 @@
"resource":{
"jcr:primaryType":"ravedata:resource",
"jcr:lastModifiedBy":"admin",
-
"jcr:binary:jcr:data":"PCMtLSBAZnRsdmFyaWFibGUgbmFtZT0iYXBwbGljYXRpb25Qcm9wZXJ0aWVzIiB0eXBlPSJqYXZhLnV0aWwuTWFwIiAtLT4KPCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPGZvb3Rlcj4KICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICAgICAgPGRpdiBjbGFzcz0icm93Ij4KICAgICAgICAgICAgPGRpdiBjbGFzcz0ic3BhbjEyIHZlcnNpb24iPgogICAgICAgICAgICAgICAgPHNwYW4+QXBhY2hlIFJhdmUgJHthcHBsaWNhdGlvblByb3BlcnRpZXNbJ3BvcnRhbC52ZXJzaW9uJ119PC9zcGFuPgogICAgICAgICAgICAgICAgPGEgaHJlZj0iaHR0cDovL3JhdmUuYXBhY2hlLm9yZyI+PGltZyBjbGFzcz0iZm9vdGVyLWxvZ28iIGFsdD0iQXBhY2hlIFJhdmUiIHRpdGxlPSJBcGFjaGUgUmF2ZSIgc3JjPSI8QHNwcmluZy51cmwgJy9zdGF0aWMvaW1hZ2VzL3JhdmUtbG9nby5wbmcnLz4iLz48L2E+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAgIDwvZGl2PgogICAgPC9kaXY+CjwvZm9vdGVyPg==",
+
"jcr:binary:jcr:data":"PCMtLSBAZnRsdmFyaWFibGUgbmFtZT0iYXBwbGljYXRpb25Qcm9wZXJ0aWVzIiB0eXBlPSJqYXZhLnV0aWwuTWFwIiAtLT4KPCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPGZvb3Rlcj4KICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICAgICAgPGRpdiBjbGFzcz0icm93Ij4KICAgICAgICAgICAgPGRpdiBjbGFzcz0ic3BhbjEyIHZlcnNpb24iPgogICAgICAgICAgICAgICAgPHNwYW4+QXBhY2hlIFJhdmUgJHthcHBsaWNhdGlvblByb3BlcnRpZXNbJ3BvcnRhbC52ZXJzaW9uJ119IEpDUiBMT0FERUQ8L3NwYW4+CiAgICAgICAgICAgICAgICA8YSBocmVmPSJodHRwOi8vcmF2ZS5hcGFjaGUub3JnIj48aW1nIGNsYXNzPSJmb290ZXItbG9nbyIgYWx0PSJBcGFjaGUgUmF2ZSIgdGl0bGU9IkFwYWNoZSBSYXZlIiBzcmM9IjxAc3ByaW5nLnVybCAnL3N0YXRpYy9pbWFnZXMvcmF2ZS1sb2dvLnBuZycvPiIvPjwvYT4KICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgPC9kaXY+CiAgICA8L2Rpdj4KPC9mb290ZXI+",
"jcr:encoding":"test",
"jcr:mimeType":"text/plain",
"jcr:lastModified":"2012-08-30T10:48:40.534+0200"
@@ -59,7 +59,7 @@
"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:binary:jcr:data":"PCNpbmNsdWRlICIuLi90YWdsaWJzLmZ0bCIvPgo8I21hY3JvIHJhdmVKYXZhc2NyaXB0PgoKPHNjcmlwdCBzcmM9Ii8vY2RuanMuY2xvdWRmbGFyZS5jb20vYWpheC9saWJzL2pzb24yLzIwMTEwMjIzL2pzb24yLmpzIj48L3NjcmlwdD4KPHNjcmlwdCBzcmM9Ii8vYWpheC5hc3BuZXRjZG4uY29tL2FqYXgvanF1ZXJ5L2pxdWVyeS0xLjcuMi5taW4uanMiPjwvc2NyaXB0Pgo8c2NyaXB0IHNyYz0iLy9hamF4LmFzcG5ldGNkbi5jb20vYWpheC9qcXVlcnkudWkvMS44LjE3L2pxdWVyeS11aS5taW4uanMiPjwvc2NyaXB0Pgo8c2NyaXB0IHNyYz0iLy9hamF4LmFzcG5ldGNkbi5jb20vYWpheC9qcXVlcnkudmFsaWRhdGUvMS44LjEvanF1ZXJ5LnZhbGlkYXRlLm1pbi5qcyI+PC9zY3JpcHQ+CjxzY3JpcHQgc3JjPSIvL2NkbmpzLmNsb3VkZmxhcmUuY29tL2FqYXgvbGlicy9qcXVlcnktaGFzaGNoYW5nZS92MS4zL2pxdWVyeS5iYS1oYXNoY2hhbmdlLm1pbi5qcyI+PC9zY3JpcHQ+Cgo8c2NyaXB0IHNyYz0iLy9jZG5qcy5jbG91ZGZsYXJlLmNvbS9hamF4L2xpYnMvdHdpdHRlci1ib290c3RyYXAvMi4wLjMvYm9vdHN0cmFwLm1pbi5qcyI+PC9zY3JpcHQ+CjwhLS1baWYgbHQgSUUgOV0+PHNjcmlwdCBzcmM9Ii8vY3NzMy1tZWRpYXF1ZXJpZXMtanMuZ29vZ2xlY29kZS5jb20vc3ZuL3RydW5rL2NzczMtbWVkaWFxdWVyaWVzLmpzIj48L3NjcmlwdD48IVtlbm
RpZl0tLT4KICAgIDwjYXNzaWduIGpzRGVidWdNb2RlPgogICAgICAgIDxAcG9ydGFsWydyZW5kZXItanMtZGVidWctbW9kZSddLz4KICAgIDwvI2Fzc2lnbj4KCiAgICA8I2lmIGpzRGVidWdNb2RlID09ICcxJz4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmUuanMiLz4iPjwvc2NyaXB0PgogICAgPHNjcmlwdCBzcmM9IjxAc3ByaW5nLnVybCAiL3N0YXRpYy9zY3JpcHQvcmF2ZV9hcGkuanMiLz4iPjwvc2NyaXB0PgogICAgPHNjcmlwdCBzcmM9IjxAc3ByaW5nLnVybCAiL3N0YXRpYy9zY3JpcHQvcmF2ZV9vcGVuc29jaWFsLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfd29va2llLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfbGF5b3V0LmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHNwcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfZm9ybXMuanMiLz4iPjwvc2NyaXB0PgogICAgPHNjcmlwdCBzcmM9IjxAc3ByaW5nLnVybCAiL3N0YXRpYy9zY3JpcHQvcmF2ZV9wZXJzb25fcHJvZmlsZS5qcyIvPiI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJpbmcudXJsICIvc3RhdGljL3NjcmlwdC9yYXZlX3N0b3JlLmpzIi8+Ij48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSI8QHN
wcmluZy51cmwgIi9zdGF0aWMvc2NyaXB0L3JhdmVfYWRtaW4uanMiLz4iPjwvc2NyaXB0PgogICAgPHNjcmlwdCBzcmM9IjxAc3ByaW5nLnVybCAiL3N0YXRpYy9zY3JpcHQvcmF2ZV9hbGwubWluLmpzIi8+Ij48L3NjcmlwdD4KCiAgICA8I2Vsc2U+CiAgICA8c2NyaXB0IHNyYz0iPEBzcHJpbmcudXJsICIvYXBwL21lc3NhZ2VidW5kbGUvcmF2ZV9jbGllbnRfbWVzc2FnZXMuanMiLz4iPjwvc2NyaXB0PgogICAgPC8jaWY+CgoKCgo8c2NyaXB0PgoKICAgIHJhdmUuc2V0Q29udGV4dCgiPEBzcHJpbmcudXJsICIvYXBwLyIgLz4iKTsKICAgIHJhdmUuc2V0SmF2YVNjcmlwdERlYnVnTW9kZSgke2pzRGVidWdNb2RlfSk7CiAgICAgICAgPEBzZWMuYXV0aG9yaXplIGFjY2Vzcz0iaXNBdXRoZW50aWNhdGVkKCkiPgogICAgICAgICAgICA8QHNlYy5hdXRoZW50aWNhdGlvbiBwcm9wZXJ0eT0icHJpbmNpcGFsLnVzZXJuYW1lIiBzY29wZT0icmVxdWVzdCIgdmFyPSJ1c2VybmFtZSIvPgogICAgICAgICAgICA8QHNlYy5hdXRoZW50aWNhdGlvbiBwcm9wZXJ0eT0icHJpbmNpcGFsLmlkIiBzY29wZT0icmVxdWVzdCIgdmFyPSJpZCIvPgogICAgICAgIHJhdmUuc2V0UGFnZVZpZXdlcih7dXNlcm5hbWU6IiR7dXNlcm5hbWV9IiwgaWQ6IiR7aWR9In0pOwogICAgICAgIDwvQHNlYy5hdXRob3JpemU+Cjwvc2NyaXB0PgoKPCMtLQoKCjwlLS0gY29tbW9uIGphdmFzY3JpcHQgdG8gZXhlY3V0ZSBvbiBhbGwgcGFnZXMg
LS0lPgoKLS0+Cgo8LyNtYWNybz4K",
"jcr:encoding":"test",
"jcr:mimeType":"text/plain",
"jcr:lastModified":"2012-08-30T10:48:40.534+0200"
