Author: marijan
Date: Sat Sep 15 16:28:05 2012
New Revision: 1385106
URL: http://svn.apache.org/viewvc?rev=1385106&view=rev
Log:
- move classes
Added:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
(contents, props changed)
- copied, changed from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java
Removed:
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/util/DataUtils.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/BinaryResourceView.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateHolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrResourceUtils.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java
Modified:
rave/sandbox/content-services/pom.xml
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/META-INF/rave/module.json
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/test/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManagerTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
Modified: rave/sandbox/content-services/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1385106&r1=1385105&r2=1385106&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Sat Sep 15 16:28:05 2012
@@ -192,6 +192,8 @@
<module>rave-web-jcr</module>
<module>rave-jcr-tools</module>
<module>demo-portal</module>
+ <module>simple-app</module>
+
</modules>
<build>
Modified:
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-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java?rev=1385106&r1=1385105&r2=1385106&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-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManager.java
Sat Sep 15 16:28:05 2012
@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import javax.jcr.Credentials;
+import javax.jcr.LoginException;
+import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -52,17 +54,17 @@ public class DefaultDocumentManager impl
public static final char PATH_SEPARATOR = '/';
private Repository repository;
- private Session session;
- private ObjectContentManager manager;
private Credentials credentials;
private LazyRepositoryFactory factory;
private ServletContext context;
+ private String workspace;
- public DefaultDocumentManager(ServletContext context,
LazyRepositoryFactory factory, Credentials credentials) {
+ public DefaultDocumentManager(ServletContext context,
LazyRepositoryFactory factory, Credentials credentials, String workspace) {
this.context = context;
- this.credentials = credentials;
this.factory = factory;
+ this.credentials = credentials;
+ this.workspace = workspace;
final Repository myRepository = factory.getRepository(this);
if (myRepository != null) {
repositoryAvailable(factory.getFactoryKey(), myRepository);
@@ -70,34 +72,47 @@ public class DefaultDocumentManager impl
}
- public DefaultDocumentManager(Session session) {
- this.session = session;
- manager = createManager();
-
+ public DefaultDocumentManager(Repository repository, Credentials
credentials, String workspace) {
+ this.repository = repository;
+ this.credentials = credentials;
+ this.workspace = workspace;
}
@Override
public <T extends Document> T fetchDocument(String path, Class<T> clazz) {
-
- final ObjectContentManager ourManager = getManager();
- if (ourManager == null) {
+ if (!initRepository()) {
return null;
}
- @SuppressWarnings("unchecked")
- final T document = (T) ourManager.getObject(clazz, path);
- log.info("Loaded Document: {}", document);
- return document;
+ Session session = null;
+ try {
+ session = StringUtils.isBlank(workspace) ?
repository.login(credentials) : repository.login(credentials, workspace);
+ ObjectContentManager manager = createManager(session);
+ @SuppressWarnings("unchecked")
+ final T document = (T) manager.getObject(clazz, path);
+ log.info("Loaded Document: {}", document);
+ return document;
+ } catch (LoginException e) {
+ log.error("Couldn't login", e);
+ } catch (NoSuchWorkspaceException e) {
+ log.error("Workspace not found", e);
+ } catch (RepositoryException e) {
+ log.error("Error fetching document", e);
+ } finally {
+ if (session != null && session.isLive()) {
+ session.logout();
+ }
+ }
+ return null;
}
- @Override
- public Session getSession() {
- return session;
- }
@Override
public boolean saveDocument(Document document) {
+ if (!initRepository()) {
+ return false;
+ }
if (document == null || document.getPath() == null) {
throw new IllegalArgumentException("Cannot save document which is
null or has no path");
}
@@ -105,26 +120,43 @@ public class DefaultDocumentManager impl
throw new IllegalArgumentException("Cannot save document with
relative path");
}
- ObjectContentManager ourManager = getManager();
- if (ourManager == null) {
- return false;
- }
- if (ourManager.getObject(document.getPath()) != null) {
- log.error("Object already exists {}", document.getPath());
- return false;
+ Session session = null;
+ try {
+ session = StringUtils.isBlank(workspace) ?
repository.login(credentials) : repository.login(credentials, workspace);
+ ObjectContentManager manager = createManager(session);
+ if (manager == null) {
+ return false;
+ }
+ if (manager.getObject(document.getPath()) != null) {
+ log.error("Object already exists {}", document.getPath());
+ return false;
+ }
+ createSubfolders(manager, document.getPath());
+ manager.insert(document);
+ manager.save();
+ return true;
+ } catch (RepositoryException e) {
+
+ } finally {
+ if (session != null && session.isLive()) {
+ session.logout();
+ }
}
- createSubfolders(document.getPath());
- ourManager.insert(document);
- ourManager.save();
- return true;
+ return false;
+ }
+
+ private boolean initRepository() {
+ return repository != null || (repository =
factory.getRepository(this)) != null;
}
+
/**
* Create subfolders
*
- * @param path path provided
+ * @param manager instance of ObjectContentManager
+ * @param path path provided
*/
- private void createSubfolders(String path) {
+ private void createSubfolders(ObjectContentManager manager, String path) {
final String[] pathParts = StringUtils.split(path, PATH_SEPARATOR);
final int length = pathParts.length;
@@ -137,51 +169,25 @@ public class DefaultDocumentManager impl
for (String pathPart : pathParts) {
if (StringUtils.isNotBlank(pathPart)) {
final String folderPath = parent.append(pathPart).toString();
- final ObjectContentManager ourManager = getManager();
- if (ourManager == null) {
- return;
- }
-
- if (ourManager.getObject(folderPath) != null) {
+ if (manager.getObject(folderPath) != null) {
log.debug("Path already exists {}", folderPath);
return;
}
final Document folder = new ContentFolder(folderPath);
- ourManager.insert(folder);
- ourManager.save();
+ manager.insert(folder);
+ manager.save();
parent.append(PATH_SEPARATOR);
}
}
}
-
- private ObjectContentManager getManager() {
- if (repository != null) {
- try {
- this.session = repository.login(credentials);
- manager = createManager();
- return manager;
- } catch (RepositoryException e) {
- throw new IllegalStateException("Cannot login into repository:
" + e.getMessage());
- }
- } else {
-
- log.error("Repository was not initialized");
- }
- return null;
- }
-
- private ObjectContentManager createManager() {
+ private ObjectContentManager createManager(final Session session) {
@SuppressWarnings("rawtypes")
List<Class> classes = new ArrayList<Class>();
-
-
- // implementations:
classes.add(Content.class);
classes.add(ContentFolder.class);
classes.add(BinaryContent.class);
classes.add(BinaryResource.class);
-
Mapper mapper = new AnnotationMapperImpl(classes);
return new ObjectContentManagerImpl(session, mapper);
}
Modified:
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-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java?rev=1385106&r1=1385105&r2=1385106&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-jcr-integration/data-model/src/main/java/org/apache/rave/jcr/data/mapping/DocumentManager.java
Sat Sep 15 16:28:05 2012
@@ -19,8 +19,6 @@
package org.apache.rave.jcr.data.mapping;
-import javax.jcr.Session;
-
import org.apache.rave.jcr.data.document.Document;
/**
@@ -47,12 +45,5 @@ public interface DocumentManager {
*/
boolean saveDocument(Document document);
- /**
- * Return session used by manager
- *
- * @return JCR session
- */
- Session getSession();
-
}
Modified:
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/META-INF/rave/module.json
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/META-INF/rave/module.json?rev=1385106&r1=1385105&r2=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/META-INF/rave/module.json
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/META-INF/rave/module.json
Sat Sep 15 16:28:05 2012
@@ -9,7 +9,7 @@
}
},
"contents":{
- "raveconfig":{
+ "pages":{
"file":"initial-data.json",
"parent":"/",
"importBehavior":"merge"
Modified:
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/rave-jcr-integration/data-model/src/main/resources/initial-data.json?rev=1385106&r1=1385105&r2=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/initial-data.json
(original)
+++
rave/sandbox/content-services/rave-jcr-integration/data-model/src/main/resources/initial-data.json
Sat Sep 15 16:28:05 2012
@@ -1,16 +1,15 @@
{
- "exampleImage":{
+ "jcr:primaryType":"ravedata:folder",
+ "mypage.ftl":{
"jcr:primaryType":"ravedata:binary",
- "id":"exampleImage",
+ "id":"freemarker",
"resource":{
"jcr:primaryType":"ravedata:resource",
"jcr:lastModifiedBy":"admin",
-
"jcr:binary:jcr:data":"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABHNCSVQICAgIfAhkiAAAAA1JREFUCJljYGBg+A8AAQQBAH2yyN8AAAAASUVORK5CYII=",
+
"jcr:binary:jcr:data":"PCNpbXBvcnQgIi9zcHJpbmcuZnRsIiBhcyBzcHJpbmcgLz4KPCNhc3NpZ24gcmF2ZT1Kc3BUYWdsaWJzWyJodHRwOi8vd3d3LmFwYWNoZS1yYXZlLm9yZy9qc3AvY29yZSJdIC8+CjxodG1sPgoKPGJvZHk+CjxoMT5teSBmcmVlbWFya2VyIHBhZ2UgZnJvbSBKQ1I8L2gxPgo8dGFibGUgYm9yZGVyPSIxIj4KICAgIDx0cj4KICAgICAgICA8dGQ+aGVhZAogICAgICAgIDxAcmF2ZS5pbmNsdWRlIHJlZj0iaGVhZCIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgogICAgPHRyPgogICAgICAgIDx0ZD5ib2R5CiAgICAgICAgPEByYXZlLmluY2x1ZGUgcmVmPSJib2R5Ii8+CiAgICAgICAgPC90ZD4KICAgIDwvdHI+CiAgICA8dHI+CiAgICAgICAgPHRkPiBmb290ZXIKICAgICAgICA8QHJhdmUuaW5jbHVkZSByZWY9ImZvb3RlciIvPgogICAgICAgIDwvdGQ+CiAgICA8L3RyPgo8L3RhYmxlPgo8L2JvZHk+CjwvaHRtbD4KCg==",
"jcr:encoding":"test",
"jcr:mimeType":"image/png",
"jcr:lastModified":"2012-08-30T10:48:40.534+0200"
}
}
-}
-
-
+}
\ No newline at end of file
Modified:
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-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManagerTest.java?rev=1385106&r1=1385105&r2=1385106&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-jcr-integration/data-model/src/test/java/org/apache/rave/jcr/data/mapping/DefaultDocumentManagerTest.java
Sat Sep 15 16:28:05 2012
@@ -26,6 +26,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
+import javax.jcr.Credentials;
import javax.jcr.NamespaceException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
@@ -55,10 +56,12 @@ public class DefaultDocumentManagerTest
public static final String PATH_BINARIES = "binaries";
public static final String PATH_LOGO = "logo";
private Map<String, String> usedPaths = new HashMap<String, String>();
+ private Credentials credentials;
@Override
protected void setUp() throws Exception {
super.setUp();
+ credentials = getHelper().getSuperuserCredentials();
usedPaths.put(PATH_RAVE_SYSTEM, PATH_RAVE_SYSTEM);
usedPaths.put(PATH_BINARIES, PATH_BINARIES);
usedPaths.put(PATH_LOGO, PATH_LOGO);
@@ -99,10 +102,12 @@ public class DefaultDocumentManagerTest
while (nodes.hasNext()) {
log.info("nodes {}", nodes.nextNode().getPath());
}
+ // note: we need to save session so it is reflected in document manager
+ superuser.save();
- DocumentManager manager = new DefaultDocumentManager(superuser);
+ DocumentManager manager = new
DefaultDocumentManager(superuser.getRepository(), credentials,
superuser.getWorkspace().getName());
BinaryDocument document =
manager.fetchDocument("/binaries/binaries/css", BinaryContent.class);
- assertTrue(document != null);
+ assertTrue("Expected to fetch /binaries/binaries/css", document !=
null);
assertEquals("text/plain", document.getResource().getMimeType());
// CSS
document = manager.fetchDocument("/binaries/binaries/img",
BinaryContent.class);
@@ -113,7 +118,7 @@ public class DefaultDocumentManagerTest
public void testFolderCreation() throws Exception {
- DocumentManager manager = new DefaultDocumentManager(superuser);
+ DocumentManager manager = new
DefaultDocumentManager(superuser.getRepository(), credentials,
superuser.getWorkspace().getName());
boolean success = manager.saveDocument(new
ContentFolder("/binaries/binaries/binaries/test"));
assertTrue("Expected folders to be created", success);
@@ -124,7 +129,7 @@ public class DefaultDocumentManagerTest
final InputStream image =
getClass().getResourceAsStream("/one-pixel-image.png");
try {
Node rootNode = superuser.getNode("/");
- DocumentManager manager = new DefaultDocumentManager(superuser);
+ DocumentManager manager = new
DefaultDocumentManager(superuser.getRepository(), credentials,
superuser.getWorkspace().getName());
// image
BinaryContent document = new BinaryContent();
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.resource;
+package org.apache.rave.portal.web.mvc.config.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/config/view/BinaryRepositoryController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryRepositoryController.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.resource;
+package org.apache.rave.portal.web.mvc.config.view;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -33,7 +33,6 @@ import org.apache.rave.jcr.data.mapping.
import org.apache.rave.jcr.utils.JcrUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.servlet.view.AbstractView;
/**
@@ -46,7 +45,7 @@ public class BinaryResourceView extends
private final String binaryPath;
- @Autowired
+
private DocumentManager documentManager;
public BinaryResourceView(String binaryPath) {
@@ -93,5 +92,7 @@ public class BinaryResourceView extends
return JcrUtils.parseMimeType(content.getResource().getData());
}
-
+ public void setDocumentManager(DocumentManager documentManager) {
+ this.documentManager = documentManager;
+ }
}
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/BinaryResourceView.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
(from r1385105,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/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/config/view/FreeMarkerTemplateHolder.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateHolder.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.view;
+package org.apache.rave.portal.web.mvc.config.view;
import java.io.Serializable;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateHolder.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
(from r1385105,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/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/config/view/FreeMarkerTemplateLoader.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoader.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.view;
+package org.apache.rave.portal.web.mvc.config.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/config/view/FreeMarkerTemplateLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/FreeMarkerTemplateLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.config.resource;
+package org.apache.rave.portal.web.mvc.config.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/config/view/JcrRepositoryResourceLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrRepositoryResourceLoader.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
(from r1385105,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/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/config/view/JcrResourceUtils.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/view/JcrResourceUtils.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.view;
+package org.apache.rave.portal.web.mvc.config.view;
/**
* @version "$Id$"
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/view/JcrResourceUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java?p2=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java&p1=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BaseTest.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.view;
import java.io.IOException;
import java.io.InputStream;
@@ -28,6 +28,7 @@ import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
import org.apache.jackrabbit.commons.cnd.CndImporter;
+import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.rave.jcr.data.mapping.DocumentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,14 +36,14 @@ import org.slf4j.LoggerFactory;
/**
* @version "$Id$"
*/
-public abstract class BaseTest {
+public abstract class BaseTest extends AbstractJCRTest {
private static Logger log = LoggerFactory.getLogger(BaseTest.class);
- protected void registerDataCnd(DocumentManager manager) {
+ protected void registerDataCnd(DocumentManager manager) throws
RepositoryException {
final String cndFile = "/rave-data-model.cnd";
final InputStream cnd = getClass().getResourceAsStream(cndFile);
- registerCnd(manager.getSession(), cnd);
+ registerCnd(getHelper().getSuperuserSession(), cnd);
}
protected void registerCnd(final Session session, final InputStream
stream) {
@@ -59,7 +60,10 @@ public abstract class BaseTest {
log.error("Error registering CND: ", e);
} catch (IOException e) {
log.error("Error loading CND file: ", e);
+ } finally {
+ if (session != null && session.isLive()) {
+ session.logout();
+ }
}
-
}
}
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BaseTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/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?p2=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java&p1=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryControllerTest.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/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:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.view;
import java.util.Calendar;
import java.util.Map;
@@ -46,9 +46,6 @@ import org.springframework.web.servlet.M
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
import org.springframework.web.servlet.mvc.Controller;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
/**
* @version "$Id$"
*/
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/BinaryRepositoryControllerTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java?p2=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java&p1=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoaderTest.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java
Sat Sep 15 16:28:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.view;
import org.junit.Before;
import org.junit.Test;
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/FreeMarkerTemplateLoaderTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
(from r1385105,
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/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?p2=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java&p1=rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java&r1=1385105&r2=1385106&rev=1385106&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/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:05 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.view;
import java.io.InputStream;
import java.io.StringWriter;
@@ -28,7 +28,7 @@ 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.resource.JcrRepositoryResourceLoader;
+import org.apache.rave.portal.web.mvc.config.view.JcrRepositoryResourceLoader;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,10 +41,6 @@ import org.springframework.core.io.Resou
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
/**
* @version "$Id$"
*/
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/JcrRepositoryResourceLoaderTest.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1385106&r1=1385105&r2=1385106&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:05 2012
@@ -205,12 +205,14 @@
-->
- <bean id="documentManager"
class="org.apache.rave.jcr.data.mapping.DefaultDocumentManager">
- <constructor-arg index="0" ref="repository"/>
- <constructor-arg index="1" ref="javax.jcr.SimpleCredentials"/>
+ <bean id="documentManager"
class="org.apache.rave.jcr.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.config.resource.JcrRepositoryResourceLoader">
+ <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.config.view.JcrRepositoryResourceLoader">
<constructor-arg ref="documentManager"/>
</bean>
@@ -218,7 +220,7 @@
<property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
<property name="preTemplateLoaders">
<list>
- <bean
class="org.apache.rave.portal.web.mvc.config.resource.FreeMarkerTemplateLoader">
+ <bean
class="org.apache.rave.portal.web.mvc.config.view.FreeMarkerTemplateLoader">
<property name="loader" ref="jcrResourceLoader"/>
</bean>
</list>
@@ -245,7 +247,7 @@
// see also:
org.springframework.web.servlet.config.viewControllerHandlerMapping
//*************************************************************************************
-->
- <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.config.resource.BinaryRepositoryController">
+ <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.config.view.BinaryRepositoryController">
<property name="methodNameResolver" ref="binaryNameResolver"/>
</bean>
