Author: marijan
Date: Sat Sep 15 16:28:31 2012
New Revision: 1385108
URL: http://svn.apache.org/viewvc?rev=1385108&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- move packages
- merge test config
Added:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
(contents, props changed)
- copied, changed from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
(contents, props changed)
- copied, changed from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
(contents, props changed)
- copied, changed from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
(contents, props changed)
- copied, changed from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
(contents, props changed)
- copied, changed from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
(contents, props changed)
- copied, changed from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
Removed:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
(from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java&r1=1385106&r2=1385108&rev=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
Sat Sep 15 16:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.view;
+package org.apache.rave.portal.web.mvc.view;
import java.util.HashMap;
import java.util.Map;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
(from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java&r1=1385106&r2=1385108&rev=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
Sat Sep 15 16:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.view;
+package org.apache.rave.portal.web.mvc.view;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
(from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java&r1=1385106&r2=1385108&rev=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
Sat Sep 15 16:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.view;
+package org.apache.rave.portal.web.mvc.view;
import java.io.Serializable;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
(from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java&r1=1385106&r2=1385108&rev=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
Sat Sep 15 16:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.view;
+package org.apache.rave.portal.web.mvc.view;
import java.io.IOException;
import java.io.InputStream;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
(from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/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?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java&r1=1385106&r2=1385108&rev=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/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:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.view;
+package org.apache.rave.portal.web.mvc.view;
import org.apache.rave.jcr.data.document.impl.BinaryContent;
import org.apache.rave.jcr.data.mapping.DocumentManager;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
(from r1385106,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java&r1=1385106&r2=1385108&rev=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
Sat Sep 15 16:28:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.view;
+package org.apache.rave.portal.web.mvc.view;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java?rev=1385108&r1=1385107&r2=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
Sat Sep 15 16:28:31 2012
@@ -28,7 +28,6 @@ import org.apache.rave.jcr.data.document
import org.apache.rave.jcr.data.document.impl.BinaryContent;
import org.apache.rave.jcr.data.document.impl.BinaryResource;
import org.apache.rave.jcr.data.mapping.DocumentManager;
-import org.apache.rave.portal.web.mvc.config.view.JcrRepositoryResourceLoader;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml?rev=1385108&r1=1385107&r2=1385108&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
Sat Sep 15 16:28:31 2012
@@ -212,7 +212,7 @@
<constructor-arg value="default"/>
</bean>
- <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.config.view.JcrRepositoryResourceLoader">
+ <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.view.JcrRepositoryResourceLoader">
<constructor-arg ref="documentManager"/>
</bean>
@@ -220,7 +220,7 @@
<property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
<property name="preTemplateLoaders">
<list>
- <bean
class="org.apache.rave.portal.web.mvc.config.view.FreeMarkerTemplateLoader">
+ <bean
class="org.apache.rave.portal.web.mvc.view.FreeMarkerTemplateLoader">
<property name="loader" ref="jcrResourceLoader"/>
</bean>
</list>
@@ -247,7 +247,7 @@
// see also:
org.springframework.web.servlet.config.viewControllerHandlerMapping
//*************************************************************************************
-->
- <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.config.view.BinaryRepositoryController">
+ <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.view.BinaryRepositoryController">
<property name="methodNameResolver" ref="binaryNameResolver"/>
</bean>
