Author: marijan
Date: Sat Sep 15 16:31:27 2012
New Revision: 1385117
URL: http://svn.apache.org/viewvc?rev=1385117&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- fix freemarker macro
- don't log no resource found errors unless in debug mode
- use templates form jcr
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json?rev=1385117&r1=1385116&r2=1385117&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/resources/page-config.json
Sat Sep 15 16:31:27 2012
@@ -1,86 +1,86 @@
{
- "routes" : {
- "jcr:primaryType" : "raveconfig:routes",
- "r1" : {
- "jcr:primaryType" : "raveconfig:route",
- "path" : "/home",
- "target" : "/userPage",
- "action" : "defaultPage"
- },
- "r2" : {
- "jcr:primaryType" : "raveconfig:route",
- "path" : "/page",
- "target" : "/userPage",
- "action" : "defaultPage"
- },
- "r3" : {
- "jcr:primaryType" : "raveconfig:route",
- "path" : "/page/view",
- "target" : "/userPage",
- "action" : "defaultPage"
- },
- "r4" : {
- "jcr:primaryType" : "raveconfig:route",
- "path" : "/page/view/{pageId}",
- "target" : "/userPage"
- },
- "r5" : {
- "jcr:primaryType" : "raveconfig:route",
- "path" : "/dynapi/rest/widgets",
- "target" : "org.apache.rave.portal.web.mvc.api.rest.DynWidgetApi"
+ "routes":{
+ "jcr:primaryType":"raveconfig:routes",
+ "r1":{
+ "jcr:primaryType":"raveconfig:route",
+ "path":"/home",
+ "target":"/userPage",
+ "action":"defaultPage"
+ },
+ "r2":{
+ "jcr:primaryType":"raveconfig:route",
+ "path":"/page",
+ "target":"/userPage",
+ "action":"defaultPage"
+ },
+ "r3":{
+ "jcr:primaryType":"raveconfig:route",
+ "path":"/page/view",
+ "target":"/userPage",
+ "action":"defaultPage"
+ },
+ "r4":{
+ "jcr:primaryType":"raveconfig:route",
+ "path":"/page/view/{pageId}",
+ "target":"/userPage"
+ },
+ "r5":{
+ "jcr:primaryType":"raveconfig:route",
+ "path":"/dynapi/rest/widgets",
+ "target":"org.apache.rave.portal.web.mvc.api.rest.DynWidgetApi"
}
},
- "pages" : {
- "jcr:primaryType" : "raveconfig:pagedefinitions",
- "userPage" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "userPage",
- "controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
- "extends" : "extended",
- "viewName" : "pages/userpage/page",
- "body" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "body",
- "viewName" : "pages/userpage/page-body",
- "tabs" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "tabs",
- "viewName" : "pages/userpage/page-tabs"
+ "pages":{
+ "jcr:primaryType":"raveconfig:pagedefinitions",
+ "userPage":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"userPage",
+
"controller":"org.apache.rave.portal.web.mvc.controller.UserPageController",
+ "extends":"extended",
+ "viewName":"jcr:/pages/userpage/page",
+ "body":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"body",
+ "viewName":"pages/userpage/page-body",
+ "tabs":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"tabs",
+ "viewName":"pages/userpage/page-tabs"
},
- "content" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "content",
- "viewName" : "pages/userpage/page-content"
+ "content":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"content",
+ "viewName":"pages/userpage/page-content"
}
}
},
- "extended" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "extended",
- "controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
- "extends" : "standard",
- "viewName" : "pages/userpage/page",
- "header" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "header",
- "controller" :
"org.apache.rave.portal.web.mvc.controller.PageHeaderController",
- "viewName" : "pages/userpage/page-header"
+ "extended":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"extended",
+
"controller":"org.apache.rave.portal.web.mvc.controller.UserPageController",
+ "extends":"standard",
+ "viewName":"pages/userpage/page",
+ "header":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"header",
+
"controller":"org.apache.rave.portal.web.mvc.controller.PageHeaderController",
+ "viewName":"pages/userpage/page-header"
}
},
- "standard" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "standard",
- "controller" :
"org.apache.rave.portal.web.mvc.controller.UserPageController",
- "viewName" : "pages/userpage/page",
- "header" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "header",
- "viewName" : "pages/header"
+ "standard":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"standard",
+
"controller":"org.apache.rave.portal.web.mvc.controller.UserPageController",
+ "viewName":"pages/userpage/page",
+ "header":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"header",
+ "viewName":"pages/header"
},
- "footer" : {
- "jcr:primaryType" : "raveconfig:pagefragment",
- "name" : "footer",
- "viewName" : "pages/footer"
+ "footer":{
+ "jcr:primaryType":"raveconfig:pagefragment",
+ "name":"footer",
+ "viewName":"pages/footer"
}
}
}
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl?rev=1385117&r1=1385116&r2=1385117&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
Sat Sep 15 16:31:27 2012
@@ -13,7 +13,7 @@
<@portal['render-js-debug-mode']/>
</#assign>
- <#if jsDebugMode == 1>
+ <#if jsDebugMode == '1'>
<script src="<@spring.url "/static/script/rave.js"/>"></script>
<script src="<@spring.url "/static/script/rave_api.js"/>"></script>
<script src="<@spring.url "/static/script/rave_opensocial.js"/>"></script>
Modified:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java?rev=1385117&r1=1385116&r2=1385117&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
Sat Sep 15 16:31:27 2012
@@ -50,12 +50,16 @@ public class JcrRepositoryResourceLoader
public Resource getResource(String absolutePath) {
Assert.notNull(absolutePath, "Resource path must not be null");
if (!absolutePath.startsWith("/") &&
!absolutePath.startsWith(JcrResourceUtils.JCR_URL_PREFIX)) {
- log.error("Location provided was not absolute path nor JCR
protocol: {}", absolutePath);
+ if (log.isDebugEnabled()) {
+ log.error("Location provided was not absolute path nor JCR
protocol: {}", absolutePath);
+ }
return null;
}
final BinaryContent content =
documentManager.fetchDocument(preparePath(absolutePath), BinaryContent.class);
if (content == null) {
- log.warn("### Resource does not exists: {}", absolutePath);
+ if (log.isDebugEnabled()) {
+ log.warn("### Resource does not exists: {}", absolutePath);
+ }
return null;
}
return new InputStreamResource(content.getResource().getData());
