You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/09/20 09:10:00 UTC
svn commit: r1387888 - in /rave/sandbox/content-services:
demo-portal/src/main/webapp/WEB-INF/
rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/
rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/
rave-web-jcr/src/mai...
Author: ate
Date: Thu Sep 20 07:09:59 2012
New Revision: 1387888
URL: http://svn.apache.org/viewvc?rev=1387888&view=rev
Log:
RAVE-696: rave-web-jcr - cleanup
- moving up Content and jcr mapping related interfaces and implementations into the mvc/data and dropping the data/document and data/mapping packages
Added:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Content.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Content.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentManager.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/ContentManager.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentType.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ContentType.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Folder.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ResourceContent.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ResourceContent.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ScriptContent.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ScriptContent.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/
- copied from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/DefaultContentManager.java
- copied, changed from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultContentManager.java
Removed:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/nested-dispatcher-servlet.xml
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/Article.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseContent.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseFolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseResourceContent.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseScriptContent.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryContentTag.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrFreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java
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
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=1387888&r1=1387887&r2=1387888&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 Thu Sep 20 07:09:59 2012
@@ -290,7 +290,7 @@
</property>
</bean>
- <bean id="contentManager" class="org.apache.rave.portal.web.mvc.data.mapping.DefaultContentManager" destroy-method="shutdown">
+ <bean id="contentManager" class="org.apache.rave.portal.web.mvc.data.impl.DefaultContentManager" destroy-method="shutdown">
<constructor-arg index="0" ref="lazyRepositoryFactory"/>
<constructor-arg index="1" ref="jcrCredentials"/>
<constructor-arg index="2" value="default"/>
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Content.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Content.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Content.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Content.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Content.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Content.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Content.java Thu Sep 20 07:09:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document;
+package org.apache.rave.portal.web.mvc.data;
import java.util.Calendar;
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentManager.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/ContentManager.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentManager.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentManager.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/ContentManager.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/ContentManager.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentManager.java Thu Sep 20 07:09:59 2012
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.mapping;
+package org.apache.rave.portal.web.mvc.data;
-import org.apache.rave.portal.web.mvc.data.document.Content;
+import org.apache.rave.portal.web.mvc.data.Content;
/**
* @version "$Id$"
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentType.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ContentType.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentType.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentType.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ContentType.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ContentType.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ContentType.java Thu Sep 20 07:09:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document;
+package org.apache.rave.portal.web.mvc.data;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Folder.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Folder.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Folder.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/Folder.java Thu Sep 20 07:09:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document;
+package org.apache.rave.portal.web.mvc.data;
/**
* @version "$Id$"
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ResourceContent.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ResourceContent.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ResourceContent.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ResourceContent.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ResourceContent.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ResourceContent.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ResourceContent.java Thu Sep 20 07:09:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document;
+package org.apache.rave.portal.web.mvc.data;
import java.io.InputStream;
import java.util.Calendar;
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ScriptContent.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ScriptContent.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ScriptContent.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ScriptContent.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ScriptContent.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/ScriptContent.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/ScriptContent.java Thu Sep 20 07:09:59 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document;
+package org.apache.rave.portal.web.mvc.data;
public interface ScriptContent extends Content {
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/Article.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/Article.java?rev=1387888&r1=1387872&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/Article.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/Article.java Thu Sep 20 07:09:59 2012
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.impl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.portal.web.mvc.data.document.ContentType;
+import org.apache.rave.portal.web.mvc.data.ContentType;
@ContentType("Article")
@Node(discriminator = false, jcrType = "ravedata:content")
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseContent.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseContent.java?rev=1387888&r1=1387872&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseContent.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseContent.java Thu Sep 20 07:09:59 2012
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.impl;
import java.util.Calendar;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.portal.web.mvc.data.document.Content;
-import org.apache.rave.portal.web.mvc.data.document.ContentType;
+import org.apache.rave.portal.web.mvc.data.Content;
+import org.apache.rave.portal.web.mvc.data.ContentType;
/**
* @version "$Id$"
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseFolder.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseFolder.java?rev=1387888&r1=1387872&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseFolder.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseFolder.java Thu Sep 20 07:09:59 2012
@@ -17,13 +17,11 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document.impl;
-
-import java.util.Calendar;
+package org.apache.rave.portal.web.mvc.data.impl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.portal.web.mvc.data.document.ContentType;
-import org.apache.rave.portal.web.mvc.data.document.Folder;
+import org.apache.rave.portal.web.mvc.data.ContentType;
+import org.apache.rave.portal.web.mvc.data.Folder;
/**
* @version "$Id$"
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseResourceContent.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseResourceContent.java?rev=1387888&r1=1387872&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseResourceContent.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseResourceContent.java Thu Sep 20 07:09:59 2012
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.impl;
import java.io.InputStream;
import java.util.Calendar;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.portal.web.mvc.data.document.ContentType;
-import org.apache.rave.portal.web.mvc.data.document.ResourceContent;
+import org.apache.rave.portal.web.mvc.data.ContentType;
+import org.apache.rave.portal.web.mvc.data.ResourceContent;
/**
* @version "$Id$"
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseScriptContent.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseScriptContent.java?rev=1387888&r1=1387872&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseScriptContent.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/BaseScriptContent.java Thu Sep 20 07:09:59 2012
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.impl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.portal.web.mvc.data.document.ContentType;
-import org.apache.rave.portal.web.mvc.data.document.ScriptContent;
+import org.apache.rave.portal.web.mvc.data.ContentType;
+import org.apache.rave.portal.web.mvc.data.ScriptContent;
/**
* BaseScriptContent is used for Freemarker, Javascript etc. scripts so we can easily modify those
Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/DefaultContentManager.java (from r1387872, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultContentManager.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/DefaultContentManager.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/DefaultContentManager.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultContentManager.java&r1=1387872&r2=1387888&rev=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultContentManager.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/impl/DefaultContentManager.java Thu Sep 20 07:09:59 2012
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.data.mapping;
+package org.apache.rave.portal.web.mvc.data.impl;
-import java.security.PublicKey;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -39,14 +38,10 @@ import org.apache.jackrabbit.ocm.mapper.
import org.apache.jackrabbit.ocm.mapper.impl.annotation.AnnotationMapperImpl;
import org.apache.rave.jcr.LazyRepositoryFactory;
import org.apache.rave.jcr.LazyRepositoryFactoryListener;
-import org.apache.rave.portal.web.mvc.data.document.Content;
-import org.apache.rave.portal.web.mvc.data.document.ContentType;
-import org.apache.rave.portal.web.mvc.data.document.Folder;
-import org.apache.rave.portal.web.mvc.data.document.impl.Article;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseResourceContent;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseScriptContent;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseContent;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseFolder;
+import org.apache.rave.portal.web.mvc.data.Content;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
+import org.apache.rave.portal.web.mvc.data.ContentType;
+import org.apache.rave.portal.web.mvc.data.Folder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryContentTag.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryContentTag.java?rev=1387888&r1=1387887&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryContentTag.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/tags/RepositoryContentTag.java Thu Sep 20 07:09:59 2012
@@ -27,8 +27,8 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.web.mvc.data.document.Content;
-import org.apache.rave.portal.web.mvc.data.mapping.ContentManager;
+import org.apache.rave.portal.web.mvc.data.Content;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/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?rev=1387888&r1=1387887&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java Thu Sep 20 07:09:59 2012
@@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.rave.jcr.utils.JcrUtils;
import org.apache.rave.portal.web.mvc.HandlerContext;
import org.apache.rave.portal.web.mvc.Routed;
-import org.apache.rave.portal.web.mvc.data.document.ResourceContent;
-import org.apache.rave.portal.web.mvc.data.mapping.ContentManager;
+import org.apache.rave.portal.web.mvc.data.ResourceContent;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrFreeMarkerTemplateLoader.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrFreeMarkerTemplateLoader.java?rev=1387888&r1=1387887&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrFreeMarkerTemplateLoader.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrFreeMarkerTemplateLoader.java Thu Sep 20 07:09:59 2012
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseScriptContent;
-import org.apache.rave.portal.web.mvc.data.mapping.ContentManager;
+import org.apache.rave.portal.web.mvc.data.impl.BaseScriptContent;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
Modified: rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java?rev=1387888&r1=1387887&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java Thu Sep 20 07:09:59 2012
@@ -33,13 +33,14 @@ import org.apache.rave.jcr.exporting.Con
import org.apache.rave.jcr.importing.ContentImporter;
import org.apache.rave.jcr.importing.ImportBehavior;
import org.apache.rave.jcr.utils.JcrUtils;
-import org.apache.rave.portal.web.mvc.data.document.ResourceContent;
-import org.apache.rave.portal.web.mvc.data.document.ScriptContent;
-import org.apache.rave.portal.web.mvc.data.document.impl.Article;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseResourceContent;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseFolder;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseScriptContent;
-import org.junit.After;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
+import org.apache.rave.portal.web.mvc.data.ResourceContent;
+import org.apache.rave.portal.web.mvc.data.ScriptContent;
+import org.apache.rave.portal.web.mvc.data.impl.Article;
+import org.apache.rave.portal.web.mvc.data.impl.BaseResourceContent;
+import org.apache.rave.portal.web.mvc.data.impl.BaseFolder;
+import org.apache.rave.portal.web.mvc.data.impl.BaseScriptContent;
+import org.apache.rave.portal.web.mvc.data.impl.DefaultContentManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java?rev=1387888&r1=1387887&r2=1387888&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java (original)
+++ rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java Thu Sep 20 07:09:59 2012
@@ -21,8 +21,8 @@ package org.apache.rave.portal.web.mvc.v
import java.util.Calendar;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseResourceContent;
-import org.apache.rave.portal.web.mvc.data.mapping.ContentManager;
+import org.apache.rave.portal.web.mvc.data.impl.BaseResourceContent;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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=1387888&r1=1387887&r2=1387888&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 Thu Sep 20 07:09:59 2012
@@ -19,14 +19,8 @@
package org.apache.rave.portal.web.mvc.view;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.util.Calendar;
-
-import org.apache.commons.io.IOUtils;
import org.apache.rave.portal.web.mvc.BaseJcrTest;
-import org.apache.rave.portal.web.mvc.data.document.impl.BaseResourceContent;
-import org.apache.rave.portal.web.mvc.data.mapping.ContentManager;
+import org.apache.rave.portal.web.mvc.data.ContentManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,8 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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=1387888&r1=1387887&r2=1387888&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 Thu Sep 20 07:09:59 2012
@@ -168,7 +168,7 @@
-->
- <bean id="contentManager" class="org.apache.rave.portal.web.mvc.data.mapping.DefaultContentManager" destroy-method="shutdown">
+ <bean id="contentManager" class="org.apache.rave.portal.web.mvc.data.impl.DefaultContentManager" destroy-method="shutdown">
<constructor-arg index="0" ref="lazyRepositoryFactory"/>
<constructor-arg index="1" ref="jcrCredentials"/>
<constructor-arg index="2" value="default"/>