Author: ate
Date: Mon Sep 10 07:42:31 2012
New Revision: 1382674
URL: http://svn.apache.org/viewvc?rev=1382674&view=rev
Log:
RAVE-696: Create new rave-web-jcr module providing a JCR based implementation
of the rave-web-hmvc provided page model and controllers and integration of
other content services
- get rid of now empty rave-jcr-integration/page-configuration module
- move remaining jcr based/related functionality from rave-web-hmvc to
rave-web-jcr
- drop all jcr dependencies from rave-web-hmvc
Added:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java
- copied, changed from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryController.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java
- copied, changed from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/BinaryResourceView.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateHolder.java
- copied, changed from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateHolder.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateLoader.java
- copied, changed from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java
- copied, changed from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoader.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrResourceUtils.java
- copied, changed from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/JcrResourceUtils.java
Removed:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/
rave/sandbox/content-services/rave-web-hmvc/src/test/repository/
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/org/
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/repositoryHelperPool.properties
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/repositoryStubImpl.properties
Modified:
rave/sandbox/content-services/rave-jcr-integration/pom.xml
rave/sandbox/content-services/rave-web-hmvc/pom.xml
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml
rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoaderTest.java
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
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=1382674&r1=1382673&r2=1382674&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr-integration/pom.xml Mon Sep 10
07:42:31 2012
@@ -49,7 +49,6 @@
<module>module2</module>
<module>test</module>
<module>data-model</module>
- <module>page-configuration</module>
</modules>
</project>
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=1382674&r1=1382673&r2=1382674&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/pom.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/pom.xml Mon Sep 10 07:42:31 2012
@@ -36,26 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-page-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-data-model</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rave.sandbox.jcr</groupId>
- <artifactId>rave-jcr-service</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-core</artifactId>
<version>${apache.rave.version}</version>
@@ -99,14 +79,6 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <!-- Test -->
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-tests</artifactId>
- <version>${apache.jackrabbit.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java?rev=1382674&r1=1382673&r2=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
Mon Sep 10 07:42:31 2012
@@ -26,14 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.jcr.Credentials;
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.jcr.LazyRepositoryFactory;
-import org.apache.rave.jcr.LazyRepositoryFactoryListener;
import org.apache.rave.portal.web.mvc.config.ConfigManager;
import org.apache.rave.portal.web.mvc.config.PageConfiguration;
import org.apache.rave.portal.web.mvc.config.PageDefinition;
@@ -64,11 +58,11 @@ import org.springframework.web.servlet.m
/**
* @version "$Id$"
*/
-public class RoutedRequestMappingHandlerMapping extends
RequestMappingHandlerMapping implements LazyRepositoryFactoryListener {
+public class RoutedRequestMappingHandlerMapping extends
RequestMappingHandlerMapping { //implements LazyRepositoryFactoryListener {
private static final Logger log =
LoggerFactory.getLogger(RoutedRequestMappingHandlerMapping.class);
- private LazyRepositoryFactory repositoryFactory;
+// private LazyRepositoryFactory repositoryFactory;
private ConfigManager configManager;
@@ -89,10 +83,7 @@ public class RoutedRequestMappingHandler
private Map<RequestMappingInfo, HandlerMethod> handlerMethods;
private MultiValueMap<String, RequestMappingInfo> urlMap = new
LinkedMultiValueMap<String, RequestMappingInfo>();
- /**
- * Used only when JCR config manager is used
- */
- private Credentials credentials;
+// private Credentials credentials;
public RoutedRequestMappingHandlerMapping() {
super();
@@ -139,20 +130,21 @@ public class RoutedRequestMappingHandler
@Override
protected void initHandlerMethods() {
// TODO: figure out better way to inject JcrConfigManager
+/*
if (credentials != null) {
Repository repository = repositoryFactory.getRepository(this);
if (repository != null) {
repositoryAvailable(repositoryFactory.getFactoryKey(),
repository);
}
-
} else {
+*/
configured = true;
configsLastChecked = System.currentTimeMillis();
final PageConfiguration configuration =
configManager.loadConfiguration(configurationPath);
final UrlConfiguration urlConfig =
configManager.loadUrlConfig(urlMappingsPath, configuration);
processConfiguration(urlConfig);
- }
+ // }
}
protected void reloadConfigIfNeeded() {
@@ -170,12 +162,13 @@ public class RoutedRequestMappingHandler
}
}
+/* TODO: externalize configManager specific logic
+
@Override
public synchronized void repositoryAvailable(final Object factoryKey,
final Repository repository) {
Session session = null;
try {
configured = true;
-/* TODO: externalize configManager specific logic
session = repository.login(credentials);
configManager = new JcrConfigManager(session, configurationPath);
final PageConfiguration configuration =
configManager.loadConfiguration(configurationName);
@@ -185,7 +178,6 @@ public class RoutedRequestMappingHandler
processConfiguration(urlConfig);
} catch (RepositoryException e) {
log.error("Error obtaining session", e);
-*/
} finally {
if (session != null) {
session.logout();
@@ -202,6 +194,7 @@ public class RoutedRequestMappingHandler
public void shutdown() {
repositoryFactory.removeListener(this);
}
+*/
protected boolean isNamedMethod(Method method) {
return AnnotationUtils.findAnnotation(method, Named.class) != null;
@@ -391,7 +384,7 @@ public class RoutedRequestMappingHandler
public void setUrlMappingsPath(String urlMappingsPath) {
this.urlMappingsPath = urlMappingsPath;
}
-
+/*
public void setCredentials(Credentials credentials) {
this.credentials = credentials;
}
@@ -399,7 +392,7 @@ public class RoutedRequestMappingHandler
public void setLazyRepositoryFactory(LazyRepositoryFactory
repositoryFactory) {
this.repositoryFactory = repositoryFactory;
}
-
+*/
public void setRefreshDelay(long refreshDelay) {
this.refreshDelay = refreshDelay;
}
@@ -413,9 +406,11 @@ public class RoutedRequestMappingHandler
@Override
protected HandlerMethod getHandlerInternal(HttpServletRequest request)
throws Exception {
// force check repository available
+/*
if (repositoryFactory != null) {
repositoryFactory.getRepository();
}
+*/
reloadConfigIfNeeded();
String lookupPath =
getUrlPathHelper().getLookupPathForRequest(request);
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml?rev=1382674&r1=1382673&r2=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Mon Sep 10 07:42:31 2012
@@ -32,33 +32,6 @@
<context:component-scan base-package="org.apache.rave.portal.web.mvc"/>
<!--
-
//*************************************************************************************
- // REPOSITORY SETUP
-
//*************************************************************************************
- -->
-
-
- <bean id="repository"
class="org.apache.rave.jcr.utils.TransientBaseRepositoryFactoryBean">
- <property name="homeDirectory" value="file:./target/repository"/>
- <property name="repositoryFile"
value="org/apache/rave/jcr/jackrabbit/repository.xml"/>
-
- </bean>
-
- <bean id="jcrSessionFactory"
class="org.apache.rave.jcr.utils.JcrSessionFactory">
- <property name="repository" ref="repository"/>
- <property name="credentials" ref="javax.jcr.SimpleCredentials"/>
- </bean>
- <bean id="password" class="java.lang.String">
- <constructor-arg index="0" value="admin"/>
- </bean>
-
- <bean class="javax.jcr.SimpleCredentials">
- <constructor-arg index="0" value="admin"/>
- <constructor-arg index="1">
- <bean factory-bean="password" factory-method="toCharArray"/>
- </constructor-arg>
- </bean>
- <!--
//############################################
// INJECT FOR TESTING
//############################################
@@ -66,29 +39,6 @@
<bean name="servletContext"
class="org.springframework.mock.web.MockServletContext"/>
- <bean name="lazyRepositoryFactory"
class="org.apache.rave.jcr.LazyRepositoryFactory">
- <constructor-arg>
- <bean
class="org.apache.rave.jcr.servlet.ServletContextRepositoryFactory">
- <constructor-arg value="#{servletContext}"/>
- </bean>
- </constructor-arg>
- </bean>
-
- <!-- JCR LOGIN -->
- <bean id="jcrCredentials" class="javax.jcr.SimpleCredentials">
- <constructor-arg index="0" value="admin"/>
- <constructor-arg index="1" value="admin"/>
- </bean>
-
- <!--JCR Bootstrap -->
- <bean name="repositoryBootstrap"
class="org.apache.rave.jcr.bootstrapping.RaveBootstrap"
destroy-method="shutdown">
- <constructor-arg index="0" value="#{servletContext}"/>
- <constructor-arg index="1" ref="lazyRepositoryFactory"/>
- <constructor-arg index="2" ref="jcrCredentials"/>
- <constructor-arg index="3" value="default"/>
- <constructor-arg index="4" value="true"/>
- </bean>
-
<!-- FILE LOADING -->
<bean name="routedHandlerMapping"
class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping">
<property name="order" value="-1"/>
@@ -106,26 +56,6 @@
</bean>
- <!--
- //############################################
- // BINARY MAPPING
- //############################################
- -->
- <bean
id="org.springframework.web.servlet.config.viewControllerHandlerMapping"
class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
- <property name="order" value="1"/>
- <property name="urlMap">
- <map>
- <!-- Forwards requests to the "/" resource to the "page" view -->
- <entry key="/">
- <bean
class="org.springframework.web.servlet.mvc.ParameterizableViewController">
- <property name="viewName" value="page"/>
- </bean>
- </entry>
- <entry key="/binaries/**" value="binaryViewController"/>
- </map>
- </property>
- </bean>
-
<bean id="beanNameHandlerMapping"
class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
<property name="order" value="2"/>
</bean>
@@ -188,70 +118,10 @@
<property name="suffix" value=".jsp"/>
</bean>
-
<!-- Resolves view names to protected .jsp resources within the
/WEB-INF/views directory -->
<bean
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/jsp/views/"/>
<property name="suffix" value=".jsp"/>
</bean>
- <!--
- //############################################
- // FREEMARKER CONFIGURATION
- //############################################
- -->
-
-
- <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>
-
- <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.resource.JcrRepositoryResourceLoader">
- <constructor-arg ref="documentManager"/>
- </bean>
-
- <bean id="freemarkerConfig"
class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
- <property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
- <property name="preTemplateLoaders">
- <list>
- <bean
class="org.apache.rave.portal.web.mvc.resource.FreeMarkerTemplateLoader">
- <property name="loader" ref="jcrResourceLoader"/>
- </bean>
- </list>
- </property>
- <property name="freemarkerVariables">
- <map>
- <entry key="templateLoaderPath" value-ref="fmXmlEscape"/>
- <entry key="xml_escape" value-ref="fmXmlEscape"/>
- </map>
- </property>
- </bean>
-
- <bean id="fmXmlEscape" class="freemarker.template.utility.XmlEscape"/>
-
- <bean id="viewResolver"
class="org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver">
- <property name="cache" value="true"/>
- <property name="prefix" value=""/>
- <property name="suffix" value=".ftl"/>
- </bean>
-
- <!--
-
//*************************************************************************************
- // BINARY CONTROLLER AND RESOLVERS
- // see also:
org.springframework.web.servlet.config.viewControllerHandlerMapping
-
//*************************************************************************************
- -->
- <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.resource.BinaryRepositoryController">
- <property name="methodNameResolver" ref="binaryNameResolver"/>
- </bean>
-
- <bean id="binaryNameResolver"
class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
- <property name="mappings">
- <props>
- <prop key="/binaries/**">render</prop>
- </props>
- </property>
- </bean>
-
</beans>
Modified: rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml?rev=1382674&r1=1382673&r2=1382674&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml (original)
+++ rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml Mon Sep 10
07:42:31 2012
@@ -13,53 +13,23 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="rave-web-hmvc" />
- <orderEntry type="module" module-name="rave-jcr-page-configuration" />
- <orderEntry type="library" name="Maven: org.apache:jackrabbit-ocm:2.0.0"
level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven:
javax.jcr:jcr:2.0" level="project" />
- <orderEntry type="library" name="Maven:
commons-digester:commons-digester:1.7" level="project" />
- <orderEntry type="library" name="Maven:
commons-beanutils:commons-beanutils:1.7.0" level="project" />
- <orderEntry type="library" name="Maven:
commons-collections:commons-collections:3.1" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04"
level="project" />
- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.1"
level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1"
level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:2.2" level="project" />
- <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-jcr-commons:2.4.1" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-core:2.4.1" level="project" />
- <orderEntry type="library" name="Maven: concurrent:concurrent:1.3.4"
level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:1.4"
level="project" />
- <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.3"
level="project" />
- <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4"
level="project" />
- <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-api:2.4.1" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-spi-commons:2.4.1" level="project" />
- <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-spi:2.4.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.2"
level="project" />
- <orderEntry type="library" name="Maven:
org.apache.lucene:lucene-core:3.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.derby:derby:10.5.3.0_1"
level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1"
level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-context:3.1.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-aop:3.1.2.RELEASE" level="project" />
+ <orderEntry type="module" module-name="rave-core" />
+ <orderEntry type="module" module-name="rave-commons" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-web:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0"
level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-asm:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven:
org.springframework:spring-beans:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven:
org.springframework:spring-core:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-asm:3.1.2.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven:
commons-logging:commons-logging:1.1.1" level="project" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-expression:3.1.2.RELEASE" level="project" />
- <orderEntry type="module" module-name="rave-jcr-data-model" />
- <orderEntry type="module" module-name="rave-jcr-config" />
- <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-core:2.0.0" level="project" />
- <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-databind:2.0.0" level="project" />
- <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-annotations:2.0.0" level="project" />
- <orderEntry type="module" module-name="rave-jcr-utils" />
- <orderEntry type="module" module-name="rave-jcr-service" />
- <orderEntry type="module" module-name="rave-core" />
- <orderEntry type="module" module-name="rave-commons" />
- <orderEntry type="library" name="Maven:
org.springframework:spring-web:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.openjpa:openjpa:2.2.0"
level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.1"
level="project" />
+ <orderEntry type="library" name="Maven:
commons-collections:commons-collections:3.1" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.serp:serp:1.13.1"
level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7"
level="project" />
<orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
<orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4"
level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
<orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.1" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.6.9"
level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.6.9"
level="project" />
@@ -70,6 +40,7 @@
<orderEntry type="library" name="Maven:
com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6"
level="project" />
<orderEntry type="library" name="Maven:
commons-fileupload:commons-fileupload:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.4"
level="project" />
<orderEntry type="library" name="Maven:
org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.0"
level="project" />
<orderEntry type="library" name="Maven: org.json:json:20090211"
level="project" />
@@ -78,19 +49,47 @@
<orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1"
level="project" />
<orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c"
level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.5.2"
level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1"
level="project" />
<orderEntry type="library" name="Maven: de.odysseus.juel:juel-impl:2.2.4"
level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04"
level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-context:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-aop:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-expression:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven:
org.springframework.security:spring-security-web:3.1.1.RELEASE" level="project"
/>
<orderEntry type="library" name="Maven:
org.springframework:spring-jdbc:3.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven:
org.springframework:spring-tx:3.0.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven:
org.springframework.security:spring-security-core:3.1.1.RELEASE"
level="project" />
<orderEntry type="library" name="Maven:
org.codehaus.jackson:jackson-mapper-asl:1.8.1" level="project" />
<orderEntry type="library" name="Maven:
org.codehaus.jackson:jackson-core-asl:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1"
level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:4.8.1.1"
level="project" />
<orderEntry type="library" name="Maven:
net.tanesha.recaptcha4j:recaptcha4j:0.0.7" level="project" />
<orderEntry type="library" name="Maven:
org.springframework:spring-context-support:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.18"
level="project" />
<orderEntry type="library" name="Maven:
org.springframework:spring-webmvc:3.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven:
org.springframework:spring-test:3.1.2.RELEASE" level="project" />
+ <orderEntry type="module" module-name="rave-jcr-data-model" />
+ <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.2"
level="project" />
+ <orderEntry type="module" module-name="rave-jcr-config" />
+ <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-core:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-databind:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-annotations:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-jcr-commons:2.4.1" level="project" />
+ <orderEntry type="module" module-name="rave-jcr-utils" />
+ <orderEntry type="module" module-name="rave-jcr-service" />
+ <orderEntry type="library" name="Maven: org.apache:jackrabbit-ocm:2.0.0"
level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven:
javax.jcr:jcr:2.0" level="project" />
+ <orderEntry type="library" name="Maven:
commons-digester:commons-digester:1.7" level="project" />
+ <orderEntry type="library" name="Maven:
commons-beanutils:commons-beanutils:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: cglib:cglib:2.2" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-core:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: concurrent:concurrent:1.3.4"
level="project" />
+ <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.3"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-api:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-spi-commons:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-spi:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.lucene:lucene-core:3.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.derby:derby:10.5.3.0_1"
level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven:
javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven:
javax.servlet.jsp:jsp-api:2.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven:
javax.el:el-api:1.0" level="project" />
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java
(from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/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/resource/BinaryRepositoryController.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryController.java&r1=1382668&r2=1382674&rev=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/BinaryRepositoryController.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryRepositoryController.java
Mon Sep 10 07:42:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.config.resource;
import java.util.HashMap;
import java.util.Map;
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java
(from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/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/resource/BinaryResourceView.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/BinaryResourceView.java&r1=1382668&r2=1382674&rev=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/BinaryResourceView.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/BinaryResourceView.java
Mon Sep 10 07:42:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.config.resource;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateHolder.java
(from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/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/resource/FreeMarkerTemplateHolder.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateHolder.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateHolder.java&r1=1382668&r2=1382674&rev=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateHolder.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateHolder.java
Mon Sep 10 07:42:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.config.resource;
import java.io.Serializable;
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateLoader.java
(from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/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/resource/FreeMarkerTemplateLoader.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateLoader.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoader.java&r1=1382668&r2=1382674&rev=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/FreeMarkerTemplateLoader.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/FreeMarkerTemplateLoader.java
Mon Sep 10 07:42:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.config.resource;
import java.io.IOException;
import java.io.InputStream;
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java
(from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/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/resource/JcrRepositoryResourceLoader.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoader.java&r1=1382668&r2=1382674&rev=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/JcrRepositoryResourceLoader.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrRepositoryResourceLoader.java
Mon Sep 10 07:42:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.config.resource;
import org.apache.rave.jcr.data.document.impl.BinaryContent;
import org.apache.rave.jcr.data.mapping.DocumentManager;
Copied:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrResourceUtils.java
(from r1382668,
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/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/resource/JcrResourceUtils.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrResourceUtils.java&p1=rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/JcrResourceUtils.java&r1=1382668&r2=1382674&rev=1382674&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/resource/JcrResourceUtils.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/resource/JcrResourceUtils.java
Mon Sep 10 07:42:31 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.web.mvc.resource;
+package org.apache.rave.portal.web.mvc.config.resource;
/**
* @version "$Id$"
Modified:
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/resource/JcrRepositoryResourceLoaderTest.java?rev=1382674&r1=1382673&r2=1382674&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/resource/JcrRepositoryResourceLoaderTest.java
Mon Sep 10 07:42:31 2012
@@ -28,6 +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.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/test-config.xml?rev=1382674&r1=1382673&r2=1382674&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
Mon Sep 10 07:42:31 2012
@@ -206,7 +206,7 @@
<constructor-arg index="1" ref="javax.jcr.SimpleCredentials"/>
</bean>
- <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.resource.JcrRepositoryResourceLoader">
+ <bean id="jcrResourceLoader"
class="org.apache.rave.portal.web.mvc.config.resource.JcrRepositoryResourceLoader">
<constructor-arg ref="documentManager"/>
</bean>
@@ -214,7 +214,7 @@
<property name="templateLoaderPath" value="/WEB-INF/freemarker/"/>
<property name="preTemplateLoaders">
<list>
- <bean
class="org.apache.rave.portal.web.mvc.resource.FreeMarkerTemplateLoader">
+ <bean
class="org.apache.rave.portal.web.mvc.config.resource.FreeMarkerTemplateLoader">
<property name="loader" ref="jcrResourceLoader"/>
</bean>
</list>
@@ -241,7 +241,7 @@
// see also:
org.springframework.web.servlet.config.viewControllerHandlerMapping
//*************************************************************************************
-->
- <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.resource.BinaryRepositoryController">
+ <bean id="binaryViewController"
class="org.apache.rave.portal.web.mvc.config.resource.BinaryRepositoryController">
<property name="methodNameResolver" ref="binaryNameResolver"/>
</bean>
