Author: marijan
Date: Sat Sep 15 16:30:40 2012
New Revision: 1385113
URL: http://svn.apache.org/viewvc?rev=1385113&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content
Mapping (OCM) support
- remove unused dependencies
- disable tests (failing bacuse of repository intialize issues)
Added:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java
(with props)
Modified:
rave/sandbox/content-services/pom.xml
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
rave/sandbox/content-services/rave-web-hmvc/pom.xml
rave/sandbox/content-services/rave-web-jcr/pom.xml
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/BaseJcrTest.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/FreeMarkerTemplateLoaderTest.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/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Sat Sep 15 16:30:40 2012
@@ -186,7 +186,8 @@
<module>rave-jcr-service</module>
<module>rave-jcr</module>
<!--<module>rave-jcr-console</module>-->
- <module>rave-jcr-integration</module>
+ <!-- remove integration completely? -->
+ <!--<module>rave-jcr-integration</module>-->
<module>rave-jcr-utils</module>
<module>rave-web-hmvc</module>
<module>rave-web-jcr</module>
Modified:
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
(original)
+++
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
Sat Sep 15 16:30:40 2012
@@ -48,7 +48,7 @@ public class ServletContextRepositoryFac
contextPath = contextPath.substring(1);
}
if (!contextPath.isEmpty()) {
- contextPath = "." + contextPath;
+ contextPath = '.' + contextPath;
}
// first check for a context specific system property named
REPOSITORY_PATH_PARAM.<context path name>
contextPath = System.getProperty(REPOSITORY_PATH_PARAM +
contextPath);
@@ -88,7 +88,7 @@ public class ServletContextRepositoryFac
}
@Override
- public Repository getRepository(final Map parameters) {
+ public Repository getRepository(@SuppressWarnings("rawtypes") final Map
parameters) {
initialize();
ServletContext context = this.servletContext;
if (repositoryContextPath != null) {
Modified: rave/sandbox/content-services/rave-web-hmvc/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/pom.xml?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/pom.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/pom.xml Sat Sep 15 16:30:40 2012
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-data-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-core</artifactId>
<version>${apache.rave.version}</version>
Modified: rave/sandbox/content-services/rave-web-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/pom.xml?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/pom.xml (original)
+++ rave/sandbox/content-services/rave-web-jcr/pom.xml Sat Sep 15 16:30:40 2012
@@ -36,13 +36,33 @@
<dependencies>
<dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>jackrabbit-ocm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-web-hmvc</artifactId>
+ <artifactId>rave-jcr-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-data-model</artifactId>
+ <artifactId>rave-web-hmvc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
Sat Sep 15 16:30:40 2012
@@ -35,12 +35,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.portal.web.mvc.config.InvalidConfigurationException;
import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.apache.rave.portal.web.mvc.config.PagesConfig;
-import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException;
import org.apache.rave.portal.web.mvc.config.PagesConfigImpl;
import org.apache.rave.portal.web.mvc.config.PagesConfigManager;
-import org.apache.rave.portal.web.mvc.config.Route;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,7 +90,7 @@ public class JcrPagesConfigManager imple
}
private boolean checkBuildTime() {
- if (refreshDelay == 0 || lastBuildTime + refreshDelay <
System.currentTimeMillis()) {
+ if (refreshDelay == 0 || lastBuildTime + refreshDelay <
System.currentTimeMillis()) {
// for now: always reload after refreshDelay
return true;
}
@@ -121,9 +120,8 @@ public class JcrPagesConfigManager imple
lastBuildTime = buildTime;
} catch (RepositoryException e) {
- e.printStackTrace(); //To change body of catch statement use File
| Settings | File Templates.
- }
- finally {
+ log.error("Error loading pages configuration", e);
+ } finally {
if (session != null && session.isLive()) {
session.logout();
}
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/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?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/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:30:40 2012
@@ -25,13 +25,20 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.jcr.NamespaceException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
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.bootstrapping.Module;
+import org.apache.rave.jcr.bootstrapping.ModuleRegistry;
+import org.apache.rave.jcr.bootstrapping.ModuleScanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,11 +47,45 @@ import org.slf4j.LoggerFactory;
*/
public abstract class BaseJcrTest extends AbstractJCRTest {
+ public static final String PATH_RAVE_SYSTEM = "rave:system";
+ public static final String PATH_BINARIES = "binaries";
+ public static final String PATH_LOGO = "logo";
private static final Logger log =
LoggerFactory.getLogger(BaseJcrTest.class);
//*************************************************************************************
// NOTE: loading CND is only for testing purposes
//*************************************************************************************
+ private Map<String, String> usedPaths = new HashMap<String, String>();
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ usedPaths.put(PATH_RAVE_SYSTEM, PATH_RAVE_SYSTEM);
+ usedPaths.put(PATH_BINARIES, PATH_BINARIES);
+ usedPaths.put(PATH_LOGO, PATH_LOGO);
+ registerCnd(getHelper().getSuperuserSession(), "rave-data-model.cnd");
+ registerCnd(getHelper().getSuperuserSession(), "raveconfig.cnd");
+ // initialize rave:system
+ final Session session = getHelper().getSuperuserSession();
+ try {
+ try {
+
session.getWorkspace().getNamespaceRegistry().registerNamespace("rave",
"http://rave.apache.org/jcr/1.0";);
+ final ModuleRegistry moduleRegistry = new
ModuleRegistry(session, "/rave:system");
+ final ModuleScanner moduleScanner = new ModuleScanner("rave");
+ final URL resource =
getClass().getResource("/META-INF/rave/module.json");
+ final Module module = moduleScanner.parse(resource);
+ moduleRegistry.writeModule(module);
+
+
+ } catch (NamespaceException ignore) {
+ }
+ Node system = session.getRootNode().addNode(PATH_RAVE_SYSTEM);
+ system.addNode("modules");
+ session.save();
+ } finally {
+ session.logout();
+ }
+ }
protected void registerCnd(final Session session, final String fileName) {
log.info("@@@@ Registering CND {}", fileName);
@@ -60,8 +101,11 @@ public abstract class BaseJcrTest extend
log.error("Error registering CND: " + fileName, e);
} catch (IOException e) {
log.error("Error loading CND file: " + fileName, e);
+ } finally {
+ session.logout();
}
+
}
protected File getFile(final String path) throws
UnsupportedEncodingException {
@@ -73,5 +117,21 @@ public abstract class BaseJcrTest extend
return new File(fileName);
}
+ @Override
+ protected void tearDown() throws Exception {
+ final Session session = getHelper().getSuperuserSession();
+ final Node rootNode = session.getRootNode();
+
+ for (String path : usedPaths.keySet()) {
+ if (session.itemExists(String.format("%s%s", '/', path))) {
+ rootNode.getNode(path).remove();
+ }
+ }
+
+ session.save();
+ session.refresh(false);
+ session.logout();
+ super.tearDown();
+ }
}
Added:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java?rev=1385113&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java
(added)
+++
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java
Sat Sep 15 16:30:40 2012
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.portal.web.mvc;
+
+import java.util.Map;
+
+import javax.jcr.Repository;
+import javax.servlet.ServletContext;
+
+import org.apache.rave.jcr.servlet.ServletContextRepositoryFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version "$Id$"
+ */
+public class TestServletContextRepositoryFactory extends
ServletContextRepositoryFactory {
+
+ private static Logger log =
LoggerFactory.getLogger(TestServletContextRepositoryFactory.class);
+
+ private Repository repository;
+
+ public TestServletContextRepositoryFactory(ServletContext servletContext) {
+ super(servletContext);
+ }
+
+ @Override
+ public Repository getRepository(@SuppressWarnings("rawtypes") Map
parameters) {
+ return repository;
+ }
+
+ public void setRepository(Repository repository) {
+ this.repository = repository;
+ }
+}
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/TestServletContextRepositoryFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
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=1385113&r1=1385112&r2=1385113&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
Sat Sep 15 16:30:40 2012
@@ -21,20 +21,13 @@ package org.apache.rave.portal.web.mvc.d
import java.io.InputStream;
import java.io.StringWriter;
-import java.net.URL;
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;
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.exporting.ContentExporter;
import org.apache.rave.jcr.importing.ContentImporter;
import org.apache.rave.jcr.importing.ImportBehavior;
@@ -50,63 +43,40 @@ import org.slf4j.LoggerFactory;
/**
* @version "$Id$"
*/
-public class DefaultDocumentManagerTest extends BaseJcrTest {
+public abstract class DefaultDocumentManagerTest extends BaseJcrTest {
private static Logger log =
LoggerFactory.getLogger(DefaultDocumentManagerTest.class);
- public static final String PATH_RAVE_SYSTEM = "rave:system";
- 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);
- registerCnd(superuser, "rave-data-model.cnd");
- // initialize rave:system
- final Session session = getHelper().getSuperuserSession();
- try {
- try {
-
session.getWorkspace().getNamespaceRegistry().registerNamespace("rave",
"http://rave.apache.org/jcr/1.0";);
- } catch (NamespaceException ignore) {
- }
- Node system = session.getRootNode().addNode(PATH_RAVE_SYSTEM);
- system.addNode("modules");
- session.save();
- } finally {
- session.logout();
- }
-
}
public void testFetchDocument() throws Exception {
// import module:
- final ModuleRegistry moduleRegistry = new ModuleRegistry(superuser,
"/rave:system");
- final ModuleScanner moduleScanner = new ModuleScanner("rave");
- final URL resource =
getClass().getResource("/META-INF/rave/module.json");
- final Module module = moduleScanner.parse(resource);
- moduleRegistry.writeModule(module);
+ Session session = getHelper().getSuperuserSession();
+
// import data:
- Node rootNode = superuser.getNode("/");
- ContentImporter contentImporter = new ContentImporter(superuser);
+ Node rootNode = session.getNode("/");
+ ContentImporter contentImporter = new ContentImporter(session);
@SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
final InputStream resourceAsStream =
getClass().getResourceAsStream("/test-data.json");
contentImporter.importContent(rootNode.getPath(), PATH_BINARIES,
resourceAsStream, ImportBehavior.REPLACE);
- final Node node = superuser.getNode("/binaries/binaries");
+ final Node node = session.getNode("/binaries/binaries");
final NodeIterator nodes = node.getNodes();
while (nodes.hasNext()) {
log.info("nodes {}", nodes.nextNode().getPath());
}
// note: we need to save session so it is reflected in document manager
- superuser.save();
+ session.save();
- DocumentManager manager = new
DefaultDocumentManager(superuser.getRepository(), credentials,
superuser.getWorkspace().getName());
+ DocumentManager manager = new
DefaultDocumentManager(session.getRepository(), credentials,
session.getWorkspace().getName());
BinaryDocument document =
manager.fetchDocument("/binaries/binaries/css", BinaryContent.class);
assertTrue("Expected to fetch /binaries/binaries/css", document !=
null);
assertEquals("text/plain", document.getResource().getMimeType());
@@ -114,23 +84,29 @@ public class DefaultDocumentManagerTest
document = manager.fetchDocument("/binaries/binaries/img",
BinaryContent.class);
assertTrue(document != null);
assertEquals("image/png", document.getResource().getMimeType());
+ session.logout();
+
}
public void testFolderCreation() throws Exception {
- DocumentManager manager = new
DefaultDocumentManager(superuser.getRepository(), credentials,
superuser.getWorkspace().getName());
+ Session session = getHelper().getSuperuserSession();
+ DocumentManager manager = new
DefaultDocumentManager(session.getRepository(), credentials,
session.getWorkspace().getName());
boolean success = manager.saveDocument(new
ContentFolder("/binaries/binaries/binaries/test"));
assertTrue("Expected folders to be created", success);
+ session.logout();
}
public void testWriteDocument() throws Exception {
final InputStream image =
getClass().getResourceAsStream("/one-pixel-image.png");
+ Session session = null;
try {
- Node rootNode = superuser.getNode("/");
- DocumentManager manager = new
DefaultDocumentManager(superuser.getRepository(), credentials,
superuser.getWorkspace().getName());
+ session = getHelper().getSuperuserSession();
+ Node rootNode = session.getNode("/");
+ DocumentManager manager = new
DefaultDocumentManager(session.getRepository(), credentials,
session.getWorkspace().getName());
// image
BinaryContent document = new BinaryContent();
@@ -157,28 +133,22 @@ public class DefaultDocumentManagerTest
assertTrue(document != null);
assertTrue(document.getResource().getData() != null);
assertEquals(lastModified,
document.getResource().getLastModified());
- ContentExporter exporter = new ContentExporter(superuser);
+
+
+ ContentExporter exporter = new ContentExporter(session);
final StringWriter writer = new StringWriter();
exporter.exportContent("/logo", writer);
assertTrue(writer.toString().length() > 0);
} finally {
image.close();
+ if (session != null) {
+ session.logout();
+ }
}
}
@Override
protected void tearDown() throws Exception {
- final Node rootNode = superuser.getRootNode();
-
- for (String path : usedPaths.keySet()) {
- if (superuser.itemExists(String.format("%s%s", '/', path))) {
- rootNode.getNode(path).remove();
- }
- }
-
- superuser.save();
- superuser.refresh(false);
-
super.tearDown();
}
}
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=1385113&r1=1385112&r2=1385113&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:30:40 2012
@@ -20,9 +20,6 @@
package org.apache.rave.portal.web.mvc.view;
import java.util.Calendar;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
import org.apache.rave.portal.web.mvc.BaseJcrTest;
import org.apache.rave.portal.web.mvc.data.document.BinaryDocument;
@@ -42,7 +39,6 @@ import org.springframework.test.context.
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.HandlerExecutionChain;
-import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
import org.springframework.web.servlet.mvc.Controller;
@@ -52,7 +48,7 @@ import org.springframework.web.servlet.m
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:test-config.xml"})
-public class BinaryRepositoryControllerTest extends BaseJcrTest {
+public abstract class BinaryRepositoryControllerTest extends BaseJcrTest {
private static Logger log =
LoggerFactory.getLogger(BinaryRepositoryControllerTest.class);
@@ -73,14 +69,12 @@ public class BinaryRepositoryControllerT
@Before
public void setUp() throws Exception {
+ super.setUp();
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
handlerMapping = (SimpleUrlHandlerMapping)
applicationContext.getBean("org.springframework.web.servlet.config.viewControllerHandlerMapping");
handlerAdapter = (HandlerAdapter)
applicationContext.getBean("nestedHandlerMethodHandlerAdapter");
- final String cndFile = "/rave-data-model.cnd";
- // register CND:
- registerCnd(getHelper().getSuperuserSession(), cndFile);
final BinaryDocument document = new BinaryContent();
document.setPath("/binaries/freemarker");
final BinaryResource resource = new BinaryResource();
@@ -121,16 +115,5 @@ public class BinaryRepositoryControllerT
}
- private Object getHandler(HttpServletRequest request) throws Exception {
- Map<String, HandlerMapping> map =
applicationContext.getBeansOfType(HandlerMapping.class);
- for (HandlerMapping mapping : map.values()) {
- HandlerExecutionChain chain = mapping.getHandler(request);
- if (chain != null) {
- return chain.getHandler();
- }
- }
- return null;
- }
-
}
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/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?rev=1385113&r1=1385112&r2=1385113&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/view/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:30:40 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.mvc.view;
-import org.junit.Before;
+import org.apache.rave.portal.web.mvc.BaseJcrTest;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -33,14 +33,13 @@ import org.springframework.web.servlet.v
import freemarker.cache.TemplateLoader;
import freemarker.template.Configuration;
-import static org.junit.Assert.assertNotNull;
/**
* @version "$Id$"
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:test-config.xml"})
-public class FreeMarkerTemplateLoaderTest {
+public abstract class FreeMarkerTemplateLoaderTest extends BaseJcrTest {
private static Logger log =
LoggerFactory.getLogger(FreeMarkerTemplateLoaderTest.class);
@@ -48,12 +47,6 @@ public class FreeMarkerTemplateLoaderTes
private ApplicationContext applicationContext;
private ResourceLoader loader;
- @Before
- public void setUp() throws Exception {
- //
-
- }
-
@Test
public void testFindTemplateSource() throws Exception {
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=1385113&r1=1385112&r2=1385113&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:30:40 2012
@@ -46,7 +46,7 @@ import org.springframework.test.context.
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:test-config.xml"})
-public class JcrRepositoryResourceLoaderTest extends BaseJcrTest {
+public abstract class JcrRepositoryResourceLoaderTest extends BaseJcrTest {
private static Logger log =
LoggerFactory.getLogger(JcrRepositoryResourceLoaderTest.class);
@@ -58,10 +58,7 @@ public class JcrRepositoryResourceLoader
@Before
public void setUp() throws Exception {
-
- final String cndFile = "/rave-data-model.cnd";
- // register CND:
- registerCnd(getHelper().getSuperuserSession(), cndFile);
+ super.setUp();
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=1385113&r1=1385112&r2=1385113&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:30:40 2012
@@ -68,8 +68,9 @@
<bean name="lazyRepositoryFactory"
class="org.apache.rave.jcr.LazyRepositoryFactory">
<constructor-arg>
- <bean
class="org.apache.rave.jcr.servlet.ServletContextRepositoryFactory">
+ <bean
class="org.apache.rave.portal.web.mvc.TestServletContextRepositoryFactory">
<constructor-arg value="#{servletContext}"/>
+ <property name="repository" ref="repository"/>
</bean>
</constructor-arg>
</bean>
