Author: marijan
Date: Sat Sep 15 16:30:00 2012
New Revision: 1385111
URL: http://svn.apache.org/viewvc?rev=1385111&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- move data module
Added:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json
rave/sandbox/content-services/rave-web-jcr/src/test/resources/one-pixel-image.png
(contents, props changed)
- copied, changed from r1385110,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/one-pixel-image.png
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json
- copied, changed from r1385110,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/test-data.json
Removed:
rave/sandbox/content-services/rave-jcr-integration/data-model/pom.xml
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/META-INF/rave/module.json
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/repository/repository.xml
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/repository/workspaces/default/workspace.xml
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/log4j.dtd
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/log4j.xml
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/one-pixel-image.png
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/repositoryHelperPool.properties
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/repositoryStubImpl.properties
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/test-data.json
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/META-INF/rave/module.json
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/META-INF/rave/module.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/META-INF/rave/module.json?rev=1385111&r1=1385110&r2=1385111&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/resources/META-INF/rave/module.json
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/resources/META-INF/rave/module.json
Sat Sep 15 16:30:00 2012
@@ -6,6 +6,9 @@
"cnds":{
"rave":{
"file":"raveconfig.cnd"
+ },
+ "ravedata":{
+ "file":"rave-data-model.cnd"
}
},
"contents":{
@@ -13,6 +16,11 @@
"file":"page-config.json",
"parent":"/",
"importBehavior":"merge"
+ },
+ "pages":{
+ "file":"initial-data.json",
+ "parent":"/",
+ "importBehavior":"merge"
}
}
}
Added:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json?rev=1385111&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json
(added)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/resources/initial-data.json
Sat Sep 15 16:30:00 2012
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType":"ravedata:folder",
+ "mypage.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:encoding":"test",
+ "jcr:mimeType":"image/png",
+ "jcr:lastModified":"2012-08-30T10:48:40.534+0200"
+ }
+ }
+}
\ No newline at end of file
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/one-pixel-image.png
(from r1385110,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/one-pixel-image.png)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/one-pixel-image.png?p2=rave/sandbox/content-services/rave-web-jcr/src/test/resources/one-pixel-image.png&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/one-pixel-image.png&r1=1385110&r2=1385111&rev=1385111&view=diff
==============================================================================
Binary files - no diff available.
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/one-pixel-image.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json
(from r1385110,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/test-data.json)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json?p2=rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-data.json&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/resources/test-data.json&r1=1385110&r2=1385111&rev=1385111&view=diff
==============================================================================
(empty)
