Author: marijan
Date: Sat Sep 15 16:29:35 2012
New Revision: 1385110
URL: http://svn.apache.org/viewvc?rev=1385110&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/demo-portal/src/main/resources/initial-data.json
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/initial-data.json
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/
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/document/BinaryDocument.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/BinaryDocument.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Document.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Folder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Resource.java
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/document/impl/BinaryContent.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryContent.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryResource.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/Content.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/Content.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/ContentFolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java
rave/sandbox/content-services/rave-web-jcr/src/main/resources/rave-data-model.cnd
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/rave-data-model.cnd
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/BaseJcrTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java
(contents, props changed)
- copied, changed from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManagerTest.java
Removed:
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/BinaryDocument.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Document.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Folder.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Resource.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryContent.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryResource.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/Content.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/ContentFolder.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/initial-data.json
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/rave-data-model.cnd
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/BaseJcrTest.java
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManagerTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java
Modified:
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
rave/sandbox/content-services/rave-jcr-integration/pom.xml
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/resources/META-INF/rave/module.json
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/resources/META-INF/rave/module.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json?rev=1385110&r1=1385109&r2=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/resources/META-INF/rave/module.json
Sat Sep 15 16:29:35 2012
@@ -5,6 +5,11 @@
"file":"page-config.json",
"parent":"/",
"importBehavior":"merge"
+ },
+ "pagedata":{
+ "file":"initial-data.json",
+ "parent":"/",
+ "importBehavior":"merge"
}
}
}
Copied:
rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/initial-data.json)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json?p2=rave/sandbox/content-services/demo-portal/src/main/resources/initial-data.json&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/initial-data.json&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
(empty)
Modified: rave/sandbox/content-services/rave-jcr-integration/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/pom.xml?rev=1385110&r1=1385109&r2=1385110&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr-integration/pom.xml Sat Sep 15
16:29:35 2012
@@ -48,7 +48,6 @@
<module>module1</module>
<module>module2</module>
<module>test</module>
- <module>data-model</module>
</modules>
</project>
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/BinaryDocument.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/BinaryDocument.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/BinaryDocument.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/BinaryDocument.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/BinaryDocument.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/BinaryDocument.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/BinaryDocument.java
Sat Sep 15 16:29:35 2012
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document;
+package org.apache.rave.portal.web.mvc.data.document;
-import org.apache.rave.jcr.data.document.impl.BinaryResource;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryResource;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/BinaryDocument.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/BinaryDocument.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Document.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Document.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Document.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java
Sat Sep 15 16:29:35 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document;
+package org.apache.rave.portal.web.mvc.data.document;
/**
* Content interface
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Document.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/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/document/Folder.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Folder.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Folder.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java
Sat Sep 15 16:29:35 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document;
+package org.apache.rave.portal.web.mvc.data.document;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Folder.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Resource.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Resource.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/Resource.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java
Sat Sep 15 16:29:35 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document;
+package org.apache.rave.portal.web.mvc.data.document;
import java.io.InputStream;
import java.util.Calendar;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/Resource.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryContent.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryContent.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryContent.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryContent.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryContent.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryContent.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryContent.java
Sat Sep 15 16:29:35 2012
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.document.impl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Bean;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.jcr.data.document.BinaryDocument;
+import org.apache.rave.portal.web.mvc.data.document.BinaryDocument;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryContent.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryResource.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryResource.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/BinaryResource.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java
Sat Sep 15 16:29:35 2012
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.document.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.jcr.data.document.Resource;
+import org.apache.rave.portal.web.mvc.data.document.Resource;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/BinaryResource.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/Content.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/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/document/impl/Content.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/Content.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/Content.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/Content.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/Content.java
Sat Sep 15 16:29:35 2012
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.document.impl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.jcr.data.document.Document;
+import org.apache.rave.portal.web.mvc.data.document.Document;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/Content.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/Content.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/ContentFolder.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/ContentFolder.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/document/impl/ContentFolder.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java
Sat Sep 15 16:29:35 2012
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.rave.jcr.data.document.impl;
+package org.apache.rave.portal.web.mvc.data.document.impl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.rave.jcr.data.document.Document;
-import org.apache.rave.jcr.data.document.Folder;
+import org.apache.rave.portal.web.mvc.data.document.Document;
+import org.apache.rave.portal.web.mvc.data.document.Folder;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/document/impl/ContentFolder.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java
Sat Sep 15 16:29:35 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.jcr.data.mapping;
+package org.apache.rave.portal.web.mvc.data.mapping;
import java.util.ArrayList;
import java.util.List;
@@ -37,11 +37,11 @@ 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.jcr.data.document.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.document.impl.Content;
-import org.apache.rave.jcr.data.document.impl.ContentFolder;
+import org.apache.rave.portal.web.mvc.data.document.Document;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryContent;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryResource;
+import org.apache.rave.portal.web.mvc.data.document.impl.Content;
+import org.apache.rave.portal.web.mvc.data.document.impl.ContentFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManager.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java
Sat Sep 15 16:29:35 2012
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.rave.jcr.data.mapping;
+package org.apache.rave.portal.web.mvc.data.mapping;
-import org.apache.rave.jcr.data.document.Document;
+import org.apache.rave.portal.web.mvc.data.document.Document;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/data/mapping/DocumentManager.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/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?rev=1385110&r1=1385109&r2=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/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:29:35 2012
@@ -27,10 +27,10 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.rave.jcr.data.document.BinaryDocument;
-import org.apache.rave.jcr.data.document.impl.BinaryContent;
-import org.apache.rave.jcr.data.mapping.DocumentManager;
import org.apache.rave.jcr.utils.JcrUtils;
+import org.apache.rave.portal.web.mvc.data.document.BinaryDocument;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryContent;
+import org.apache.rave.portal.web.mvc.data.mapping.DocumentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.servlet.view.AbstractView;
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=1385110&r1=1385109&r2=1385110&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:29:35 2012
@@ -19,8 +19,8 @@
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;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryContent;
+import org.apache.rave.portal.web.mvc.data.mapping.DocumentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.InputStreamResource;
Modified:
rave/sandbox/content-services/rave-web-jcr/src/main/resources/META-INF/rave/module.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/resources/META-INF/rave/module.json?rev=1385110&r1=1385109&r2=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/resources/META-INF/rave/module.json
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/resources/META-INF/rave/module.json
Sat Sep 15 16:29:35 2012
@@ -1,11 +1,16 @@
{
"name":"raveconfig",
"namespaces":{
- "rave":"http://www.apache.org/rave/config/1.0";
+ "rave":"http://www.apache.org/rave/config/1.0";,
+ "ravedata":"http://www.apache.org/rave/data/1.0";
},
"cnds":{
"rave":{
"file":"raveconfig.cnd"
+ },
+ "ravedata":{
+ "file":"rave-data-model.cnd"
}
+
}
}
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/resources/rave-data-model.cnd
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/rave-data-model.cnd)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/resources/rave-data-model.cnd?p2=rave/sandbox/content-services/rave-web-jcr/src/main/resources/rave-data-model.cnd&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/rave-data-model.cnd&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
(empty)
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/BaseJcrTest.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java?p2=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/BaseJcrTest.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/BaseJcrTest.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java
Sat Sep 15 16:29:35 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.jcr.data.mapping;
+package org.apache.rave.portal.web.mvc;
import java.io.File;
import java.io.FileReader;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java
(from r1385108,
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/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?p2=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java&p1=rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManagerTest.java&r1=1385108&r2=1385110&rev=1385110&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/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
Sat Sep 15 16:29:35 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.jcr.data.mapping;
+package org.apache.rave.portal.web.mvc.data.mapping;
import java.io.InputStream;
import java.io.StringWriter;
@@ -35,14 +35,15 @@ import javax.jcr.Session;
import org.apache.rave.jcr.bootstrapping.Module;
import org.apache.rave.jcr.bootstrapping.ModuleRegistry;
import org.apache.rave.jcr.bootstrapping.ModuleScanner;
-import org.apache.rave.jcr.data.document.BinaryDocument;
-import org.apache.rave.jcr.data.document.impl.BinaryContent;
-import org.apache.rave.jcr.data.document.impl.BinaryResource;
-import org.apache.rave.jcr.data.document.impl.ContentFolder;
import org.apache.rave.jcr.exporting.ContentExporter;
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.BaseJcrTest;
+import org.apache.rave.portal.web.mvc.data.document.BinaryDocument;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryContent;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryResource;
+import org.apache.rave.portal.web.mvc.data.document.impl.ContentFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/data/mapping/DefaultDocumentManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1385110&r1=1385109&r2=1385110&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
Sat Sep 15 16:29:35 2012
@@ -24,10 +24,11 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.jcr.data.document.BinaryDocument;
-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.BaseJcrTest;
+import org.apache.rave.portal.web.mvc.data.document.BinaryDocument;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryContent;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryResource;
+import org.apache.rave.portal.web.mvc.data.mapping.DocumentManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,7 +52,7 @@ import org.springframework.web.servlet.m
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:test-config.xml"})
-public class BinaryRepositoryControllerTest extends BaseTest {
+public class BinaryRepositoryControllerTest extends BaseJcrTest {
private static Logger log =
LoggerFactory.getLogger(BinaryRepositoryControllerTest.class);
@@ -77,9 +78,9 @@ public class BinaryRepositoryControllerT
handlerMapping = (SimpleUrlHandlerMapping)
applicationContext.getBean("org.springframework.web.servlet.config.viewControllerHandlerMapping");
handlerAdapter = (HandlerAdapter)
applicationContext.getBean("nestedHandlerMethodHandlerAdapter");
-
+ final String cndFile = "/rave-data-model.cnd";
// register CND:
- registerDataCnd(documentManager);
+ registerCnd(getHelper().getSuperuserSession(), cndFile);
final BinaryDocument document = new BinaryContent();
document.setPath("/binaries/freemarker");
final BinaryResource resource = new BinaryResource();
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=1385110&r1=1385109&r2=1385110&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:29:35 2012
@@ -24,10 +24,11 @@ import java.io.StringWriter;
import java.util.Calendar;
import org.apache.commons.io.IOUtils;
-import org.apache.rave.jcr.data.document.BinaryDocument;
-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.BaseJcrTest;
+import org.apache.rave.portal.web.mvc.data.document.BinaryDocument;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryContent;
+import org.apache.rave.portal.web.mvc.data.document.impl.BinaryResource;
+import org.apache.rave.portal.web.mvc.data.mapping.DocumentManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,7 +46,7 @@ import org.springframework.test.context.
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:test-config.xml"})
-public class JcrRepositoryResourceLoaderTest extends BaseTest {
+public class JcrRepositoryResourceLoaderTest extends BaseJcrTest {
private static Logger log =
LoggerFactory.getLogger(JcrRepositoryResourceLoaderTest.class);
@@ -58,8 +59,9 @@ public class JcrRepositoryResourceLoader
@Before
public void setUp() throws Exception {
+ final String cndFile = "/rave-data-model.cnd";
// register CND:
- registerDataCnd(documentManager);
+ registerCnd(getHelper().getSuperuserSession(), cndFile);
final BinaryDocument document = new BinaryContent();
document.setPath("/binaries/freemarker");
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=1385110&r1=1385109&r2=1385110&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:29:35 2012
@@ -205,7 +205,7 @@
-->
- <bean id="documentManager"
class="org.apache.rave.jcr.data.mapping.DefaultDocumentManager"
destroy-method="shutdown">
+ <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"/>
