Author: marijan
Date: Sat Sep 15 16:31:01 2012
New Revision: 1385114
URL: http://svn.apache.org/viewvc?rev=1385114&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- rename taglibrary
- fix wrong deps (commons-collection and commons-beanutils)
- add basic freemarker support
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl
(with props)
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl
(with props)
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/footer.ftl
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page-body.jsp
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page.jsp
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld
rave/sandbox/content-services/rave-web-jcr/pom.xml
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/footer.ftl
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/footer.ftl?rev=1385114&r1=1385113&r2=1385114&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/footer.ftl
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/footer.ftl
Sat Sep 15 16:31:01 2012
@@ -4,7 +4,7 @@
<div class="container">
<div class="row">
<div class="span12 version">
- <span>Apache Rave ${applicationProperties['portal.version']} -
FREEMARKER</span>
+ <span>Apache Rave
${applicationProperties['portal.version']}</span>
<a href="http://rave.apache.org";><img class="footer-logo"
alt="Apache Rave" title="Apache Rave" src="<@spring.url
'/static/images/rave-logo.png'/>"/></a>
</div>
</div>
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl?rev=1385114&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl
Sat Sep 15 16:31:01 2012
@@ -0,0 +1,5 @@
+<#include "../taglibs.ftl"/>
+<#macro cssFiles>
+<link rel="stylesheet"
href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/themes/base/jquery-ui.css"/>
+<link rel="stylesheet" href="<@spring.url "/static/css/rave.css" />"/>
+</#macro>
\ No newline at end of file
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/css.ftl
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl?rev=1385114&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl
Sat Sep 15 16:31:01 2012
@@ -0,0 +1,4 @@
+<#macro metaData>
+<meta charset="ISO-8859-1"/>
+<meta name="viewport" content="width=device-width"/>
+</#macro>
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/metaData.ftl
------------------------------------------------------------------------------
svn:keywords = Id
Added:
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=1385114&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
Sat Sep 15 16:31:01 2012
@@ -0,0 +1,53 @@
+<#include "../taglibs.ftl"/>
+<#macro raveJavascript>
+
+<script
src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min.js"></script>
+<script
src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min.js"></script>
+<script
src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
+<script
src="//cdnjs.cloudflare.com/ajax/libs/jquery-hashchange/v1.3/jquery.ba-hashchange.min.js"></script>
+
+<script
src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.3/bootstrap.min.js"></script>
+<!--[if lt IE 9]><script
src="//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script><![endif]-->
+ <#assign jsDebugMode>
+ <@portal['render-js-debug-mode']/>
+ </#assign>
+
+ <#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>
+ <script src="<@spring.url "/static/script/rave_wookie.js"/>"></script>
+ <script src="<@spring.url "/static/script/rave_layout.js"/>"></script>
+ <script src="<@spring.url "/static/script/rave_forms.js"/>"></script>
+ <script src="<@spring.url
"/static/script/rave_person_profile.js"/>"></script>
+ <script src="<@spring.url "/static/script/rave_store.js"/>"></script>
+ <script src="<@spring.url "/static/script/rave_admin.js"/>"></script>
+ <script src="<@spring.url "/static/script/rave_all.min.js"/>"></script>
+
+ <#else>
+ <script src="<@spring.url
"/app/messagebundle/rave_client_messages.js"/>"></script>
+ </#if>
+
+
+
+
+<script>
+
+ rave.setContext("<@spring.url "/app/" />");
+ rave.setJavaScriptDebugMode(${jsDebugMode});
+ <@sec.authorize access="isAuthenticated()">
+ <@sec.authentication property="principal.username" scope="request"
var="username"/>
+ <@sec.authentication property="principal.id" scope="request"
var="id"/>
+ rave.setPageViewer({username:"${username}", id:"${id}"});
+ </@sec.authorize>
+</script>
+
+<#--
+
+
+<%-- common javascript to execute on all pages --%>
+
+-->
+
+</#macro>
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/macros/raveJs.ftl
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl?rev=1385114&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl
Sat Sep 15 16:31:01 2012
@@ -0,0 +1,9 @@
+<#import "/spring.ftl" as spring />
+<#assign ravehmvc=JspTaglibs["http://www.apache-rave.org/jsp/hmvc";] />
+<#assign tiles=JspTaglibs["http://tiles.apache.org/tags-tiles";] />
+<#assign portal=JspTaglibs["http://www.apache.org/rave/tags";] />
+<#assign sec=JspTaglibs["http://www.springframework.org/security/tags";] />
+<#assign c=JspTaglibs["http://java.sun.com/jsp/jstl/core";] />
+<#assign fmt=JspTaglibs["http://java.sun.com/jsp/jstl/fmt";] />
+<#assign fn=JspTaglibs["http://java.sun.com/jsp/jstl/functions";] />
+<#assign form=JspTaglibs["http://www.springframework.org/tags/form";] />
\ No newline at end of file
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/taglibs.ftl
------------------------------------------------------------------------------
svn:keywords = Id
Added:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl?rev=1385114&view=auto
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl
(added)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl
Sat Sep 15 16:31:01 2012
@@ -0,0 +1,30 @@
+<#include "../taglibs.ftl"/>
+<#import "../macros/metaData.ftl" as meta/>
+<#import "../macros/css.ftl" as css/>
+<#import "../macros/raveJs.ftl" as raveJavascript/>
+<!DOCTYPE html>
+<html class="no-js">
+<head>
+<@meta.metaData />
+ <title>rave</title>
+<@css.cssFiles/>
+ <script
src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.5.3/modernizr.min.js"></script>
+</head>
+<body>
+<input id="currentPageId" type="hidden" value="${page.id}"/>
+<#-- Header Content -->
+<@ravehmvc.include ref="header"/>
+<#-- Main Body Content -->
+<@ravehmvc.include ref="body"/>
+<#-- Footer Content -->
+<@ravehmvc.include ref="footer"/>
+<#-- render any script that needs to execute pre-src includes -->
+<#--<@portal["register-init-script location"] location="${'BEFORE_RAVE'}"/>-->
+<#-- render the javascript src includes at the bottom of the page for
performance -->
+<@raveJavascript.raveJavascript/>
+<#-- render custom javascript from extension projects if the tag is overlayed
-->
+
+<#-- render any script that needs to execute post-src includes -->
+<#--<@portal["render-init-script"] location="${'AFTER_RAVE'}"/>-->
+</body>
+</html>
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/freemarker/views/pages/userpage/page.ftl
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page-body.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page-body.jsp?rev=1385114&r1=1385113&r2=1385114&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page-body.jsp
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page-body.jsp
Sat Sep 15 16:31:01 2012
@@ -1,26 +1,26 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ taglib uri="http://www.apache-rave.org/jsp/core"; prefix="rave-core" %>
+<%@ taglib uri="http://www.apache-rave.org/jsp/hmvc"; prefix="rave-hmvc" %>
<jsp:useBean id="pageUser" type="org.apache.rave.portal.model.PageUser"
scope="request"/>
<sec:authentication property="principal.username" var="principleUsername"
scope="request"/>
-<rave-core:include ref="tabs"/>
-<rave-core:include ref="content"/>
+<rave-hmvc:include ref="tabs"/>
+<rave-hmvc:include ref="content"/>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- $(function() {
+ $(function () {
rave.initPageEditorStatus(<c:out value="${pageUser.editor}"/>);
rave.initProviders();
rave.initWidgets();
rave.initUI();
rave.layout.init();
- rave.layout.searchHandler.setDefaults("<c:out
value="${principleUsername}"/>","<sec:authentication property="principal.id"
/>","<c:out value="${page.id}"/>", "${pageUser.pageStatus}");
+ rave.layout.searchHandler.setDefaults("<c:out
value="${principleUsername}"/>", "<sec:authentication property="principal.id"
/>", "<c:out value="${page.id}"/>", "${pageUser.pageStatus}");
rave.runOnPageInitializedHandlers();
});
</script>
<c:forEach var="members" items="${page.members}">
-
<script>rave.layout.searchHandler.addExistingMember("${members.user.username}",${members.editor});</script>
+
<script>rave.layout.searchHandler.addExistingMember("${members.user.username}",
${members.editor});</script>
</c:forEach>
</portal:register-init-script>
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page.jsp
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page.jsp?rev=1385114&r1=1385113&r2=1385114&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page.jsp
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/jsp/views/pages/userpage/page.jsp
Sat Sep 15 16:31:01 2012
@@ -1,31 +1,30 @@
-<%@ page import="javax.xml.bind.JAXBElement" %>
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ taglib uri="http://www.apache-rave.org/jsp/core"; prefix="rave-core" %>
+<%@ taglib uri="http://www.apache-rave.org/jsp/hmvc"; prefix="rave-hmvc" %>
<!DOCTYPE html>
<html class="no-js">
<head>
- <rave:rave_meta_data />
- <title><rave:title /></title>
- <rave:rave_css/>
- <rave:custom_css/>
- <rave:third_party_head_js/>
- </head>
+ <rave:rave_meta_data/>
+ <title><rave:title/></title>
+ <rave:rave_css/>
+ <rave:custom_css/>
+ <rave:third_party_head_js/>
+</head>
<body>
- <input id="currentPageId" type="hidden" value="${page.id}"/>
+<input id="currentPageId" type="hidden" value="${page.id}"/>
<%-- Header Content --%>
-<rave-core:include ref="header"/>
+<rave-hmvc:include ref="header"/>
<%-- Main Body Content --%>
-<rave-core:include ref="body"/>
+<rave-hmvc:include ref="body"/>
<%-- Footer Content --%>
-<rave-core:include ref="footer"/>
+<rave-hmvc:include ref="footer"/>
<%-- render any script that needs to execute pre-src includes --%>
-<portal:render-init-script location="${'BEFORE_RAVE'}" />
+<portal:render-init-script location="${'BEFORE_RAVE'}"/>
<%-- render the javascript src includes at the bottom of the page for
performance --%>
<rave:rave_js/>
<%-- render custom javascript from extension projects if the tag is overlayed
--%>
<rave:custom_js/>
<%-- render any script that needs to execute post-src includes --%>
-<portal:render-init-script location="${'AFTER_RAVE'}" />
+<portal:render-init-script location="${'AFTER_RAVE'}"/>
</body>
</html>
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml?rev=1385114&r1=1385113&r2=1385114&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
Sat Sep 15 16:31:01 2012
@@ -39,13 +39,13 @@
<!-- Configures the @Controller programming model -->
- <!-- Inline replacement of Spring <mvc:annotation-driven/> to be able to
override/extend its behavior.
- This inline replacement has as downside that next versions of Spring
might require alignment, but the
- alternative is writing custom BeanPostProcessor(s) which are difficult
to support customizations of our own (through XML).
-
- Derived/reverse-enginered from
org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport and
-
org.springframework.web.servlet.config.DefaultServletHandlerBeanDefinitionParser
- -->
+ <!-- Inline replacement of Spring <mvc:annotation-driven/> to be able to
override/extend its behavior.
+ This inline replacement has as downside that next versions of Spring
might require alignment, but the
+ alternative is writing custom BeanPostProcessor(s) which are difficult to
support customizations of our own (through XML).
+
+ Derived/reverse-enginered from
org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport and
+
org.springframework.web.servlet.config.DefaultServletHandlerBeanDefinitionParser
+-->
<util:list id="interceptors">
<bean
class="org.springframework.web.servlet.handler.ConversionServiceExposingInterceptor">
<constructor-arg>
@@ -273,10 +273,38 @@
</property>
</bean>
- <!-- freemarker resolver -->
+ <bean id="documentManager"
class="org.apache.rave.portal.web.mvc.data.mapping.DefaultDocumentManager"
destroy-method="shutdown">
+ <constructor-arg value="#{servletContext}"/>
+ <constructor-arg ref="lazyRepositoryFactory"/>
+ <constructor-arg ref="jcrCredentials"/>
+ <constructor-arg value="default"/>
+ </bean>
+
+
+ <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.view.JcrRepositoryResourceLoader">
+ <constructor-arg ref="documentManager"/>
+ </bean>
+
<bean id="freemarkerConfig"
class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
<property name="templateLoaderPath" value="/WEB-INF/freemarker/views/"/>
+ <property name="preTemplateLoaders">
+ <list>
+ <bean
class="org.apache.rave.portal.web.mvc.view.FreeMarkerTemplateLoader">
+ <property name="loader" ref="jcrResourceLoader"/>
+ </bean>
+ </list>
+
+ </property>
+ <property name="freemarkerVariables">
+ <map>
+ <entry key="templateLoaderPath" value-ref="fmXmlEscape"/>
+ <entry key="xml_escape" value-ref="fmXmlEscape"/>
+ </map>
+ </property>
</bean>
+
+ <bean id="fmXmlEscape" class="freemarker.template.utility.XmlEscape"/>
+
<bean
class="org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver">
<property name="order" value="0"/>
<property name="cache" value="false"/>
@@ -284,6 +312,25 @@
<property name="suffix" value=".ftl"/>
</bean>
+ <!--
+
//*************************************************************************************
+ // BINARY CONTROLLER AND RESOLVERS
+ // see also:
org.springframework.web.servlet.config.viewControllerHandlerMapping
+
//*************************************************************************************
+ -->
+ <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.view.BinaryRepositoryController">
+ <property name="methodNameResolver" ref="binaryNameResolver"/>
+ </bean>
+
+ <bean id="binaryNameResolver"
class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
+ <property name="mappings">
+ <props>
+ <prop key="/binaries/**">render</prop>
+ </props>
+ </property>
+ </bean>
+
+
<!-- Resolves viewName names to protected .jsp resources within the
/WEB-INF/views directory -->
<bean
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="order" value="1"/>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld?rev=1385114&r1=1385113&r2=1385114&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/resources/META-INF/rave-core.tld
Sat Sep 15 16:31:01 2012
@@ -24,8 +24,8 @@
<description>Rave Core Tag Library</description>
<tlib-version>1.0</tlib-version>
- <short-name>rave-core</short-name>
- <uri>http://www.apache-rave.org/jsp/core</uri>
+ <short-name>rave-hmvc</short-name>
+ <uri>http://www.apache-rave.org/jsp/hmvc</uri>
<tag>
<description>Include component output</description>
<name>include</name>
Modified: rave/sandbox/content-services/rave-web-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/pom.xml?rev=1385114&r1=1385113&r2=1385114&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/pom.xml (original)
+++ rave/sandbox/content-services/rave-web-jcr/pom.xml Sat Sep 15 16:31:01 2012
@@ -38,31 +38,29 @@
<dependency>
<groupId>org.apache</groupId>
<artifactId>jackrabbit-ocm</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-digester</artifactId>
+ <groupId>commons-digester</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${apache.jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${apache.jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-config</artifactId>
+ <artifactId>rave-web-hmvc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-web-hmvc</artifactId>
+ <artifactId>rave-jcr-data-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
