Author: ard
Date: Mon Sep 10 14:05:25 2012
New Revision: 1382857
URL: http://svn.apache.org/viewvc?rev=1382857&view=rev
Log:
RAVE-695 work in fixing unit tests again
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/test-config.xml
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java?rev=1382857&r1=1382856&r2=1382857&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageDefinitions.java
Mon Sep 10 14:05:25 2012
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@XmlRootElement(name = "configuration")
+@XmlRootElement(name = "definitions")
public class FilePageDefinitions implements PageDefinitions {
private static final Logger log =
LoggerFactory.getLogger(FilePageDefinitions.class);
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=1382857&r1=1382856&r2=1382857&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 14:05:25 2012
@@ -42,14 +42,14 @@
<!-- FILE LOADING -->
<bean name="routedHandlerMapping"
class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping">
<property name="order" value="-1"/>
- <property name="configurationName" value="myConfiguration"/>
- <property name="configurationPath" value="classpath:page-definitions.xml"/>
- <property name="urlMappingsPath" value="classpath:url-definitions.xml"/>
<property name="routesManager" ref="fileConfigurationManager"/>
</bean>
- <bean id="fileConfigurationManager"
class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager"/>
+ <bean id="fileConfigurationManager"
class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager">
+ <property name="configurationPath" value="classpath:page-definitions.xml"/>
+ <property name="urlMappingsPath" value="classpath:url-definitions.xml"/>
+ </bean>
<bean name="unroutedHandlerMapping"
class="org.apache.rave.portal.web.mvc.UnRoutedRequestMappingHandlerMapping">
<property name="order" value="0"/>
