Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml?rev=1382844&r1=1382843&r2=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml (original) +++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml Mon Sep 10 13:50:32 2012 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<configuration name="default"> +<definitions name="default"> <page-definition name="myPage" description="My Page" displayname="My page" controller="org.apache.rave.portal.web.mvc.example.MyPageController"> <page-fragment name="head" controller="org.apache.rave.portal.web.mvc.example.MyHeaderController" viewname="pages/override/myheader"/> @@ -25,4 +25,4 @@ <page-fragment name="footer" controller="org.apache.rave.portal.web.mvc.example.MyFooterController"/> </page-definition> -</configuration> +</definitions>
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=1382844&r1=1382843&r2=1382844&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 13:50:32 2012 @@ -43,13 +43,13 @@ <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-configuration.xml"/> - <property name="urlMappingsPath" value="classpath:url-configuration.xml"/> - <property name="configManager" ref="fileConfigurationManager"/> + <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.FileConfigManager"/> + <bean id="fileConfigurationManager" class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager"/> <bean name="unroutedHandlerMapping" class="org.apache.rave.portal.web.mvc.UnRoutedRequestMappingHandlerMapping"> <property name="order" value="0"/> Modified: rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml?rev=1382844&r1=1382843&r2=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml (original) +++ rave/sandbox/content-services/rave-web-hmvc/src/test/resources/url-configuration.xml Mon Sep 10 13:50:32 2012 @@ -24,7 +24,7 @@ <page-fragment name="footer" path="myFooter" controller="org.apache.rave.portal.web.mvcexample.MyFooterController"/> </page-definition> --> -<url-configuration name="default"> +<url-definitions name="default"> <url-mapping url="/mypage2" page="myPage"/> <url-mapping url="/mypageFoo" page="myPage" views="bar"/> -</url-configuration> +</url-definitions> Modified: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManager.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/JcrConfigManager.java?rev=1382844&r1=1382843&r2=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManager.java (original) +++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManager.java Mon Sep 10 13:50:32 2012 @@ -30,17 +30,18 @@ import org.apache.jackrabbit.ocm.manager import org.apache.jackrabbit.ocm.manager.impl.ObjectContentManagerImpl; import org.apache.jackrabbit.ocm.mapper.Mapper; import org.apache.jackrabbit.ocm.mapper.impl.annotation.AnnotationMapperImpl; -import org.apache.rave.portal.web.mvc.config.ConfigManager; +import org.apache.rave.portal.web.mvc.config.PageRoutesManager; +import org.apache.rave.portal.web.mvc.config.RoutesManager; import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException; -import org.apache.rave.portal.web.mvc.config.PageConfiguration; -import org.apache.rave.portal.web.mvc.config.UrlConfiguration; +import org.apache.rave.portal.web.mvc.config.PageDefinitions; +import org.apache.rave.portal.web.mvc.config.Routes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @version "$Id$" */ -public class JcrConfigManager implements ConfigManager { +public class JcrConfigManager implements PageRoutesManager { private static Logger log = LoggerFactory.getLogger(JcrConfigManager.class); @@ -68,47 +69,46 @@ public class JcrConfigManager implements } - public UrlConfiguration getUrlConfig() throws InvalidConfigurationException { - final UrlConfiguration urlConfiguration = (UrlConfiguration) manager.getObject(JcrUrlConfiguration.class, configPath + '/' + urlMappingsPath); - log.info("Loaded URL configuration {}", urlConfiguration); - urlConfiguration.initialize(loadConfiguration()); - return urlConfiguration; + public Routes getRoutes() throws InvalidConfigurationException { + final Routes routes = (Routes) manager.getObject(JcrRoutes.class, configPath + '/' + urlMappingsPath); + log.info("Loaded URL configuration {}", routes); + return routes; } @Override - public PageConfiguration loadConfiguration() { - final PageConfiguration configuration = (PageConfiguration) manager.getObject(JcrPageConfiguration.class, configPath + '/' + configurationPath); - log.info("Loaded PAGE configuration {}", configuration); - return configuration; + public PageDefinitions getPageDefinitions() { + final PageDefinitions definitions = (PageDefinitions) manager.getObject(JcrPageDefinitions.class, configPath + '/' + configurationPath); + log.info("Loaded PAGE definitions {}", definitions); + return definitions; } @Override - public void saveUrlConfiguration(UrlConfiguration configuration) { + public void saveUrlConfiguration(Routes configuration) { if (configuration == null) { - throw new IllegalArgumentException("UrlConfiguration must not be null"); + throw new IllegalArgumentException("Routes must not be null"); } final String configurationName = configuration.getName(); final String path = configPath + '/' + configurationName; final Object existing = manager.getObject(path); if (existing != null) { - log.info("@DELETING: UrlConfiguration with name: {}, path: {} already exist, will be deleted", configurationName, path); + log.info("@DELETING: Routes with name: {}, path: {} already exist, will be deleted", configurationName, path); manager.remove(path); } // initialize root path: initConfigRoot(); - ((JcrUrlConfiguration) configuration).setPath(path); + ((JcrRoutes) configuration).setPath(path); manager.insert(configuration); manager.save(); } @Override - public void saveConfiguration(PageConfiguration configuration) { - if (configuration == null) { - throw new IllegalArgumentException("PageConfiguration must not be null"); + public void saveConfiguration(PageDefinitions definitions) { + if (definitions == null) { + throw new IllegalArgumentException("PageDefinitions must not be null"); } - final String configurationName = configuration.getName(); + final String configurationName = definitions.getName(); final String path = configPath + '/' + configurationName; final Object existing = manager.getObject(path); if (existing != null) { @@ -118,8 +118,8 @@ public class JcrConfigManager implements // initialize root path: initConfigRoot(); // set path: - ((JcrPageConfiguration) configuration).setPath(path); - manager.insert(configuration); + ((JcrPageDefinitions) definitions).setPath(path); + manager.insert(definitions); manager.save(); } @@ -143,11 +143,11 @@ public class JcrConfigManager implements List<Class> classes = new ArrayList<Class>(); // // implementations: - classes.add(JcrUrlMapping.class); - classes.add(JcrUrlConfiguration.class); + classes.add(JcrRoute.class); + classes.add(JcrRoutes.class); classes.add(JcrPageDefinition.class); classes.add(JcrPageFragment.class); - classes.add(JcrPageConfiguration.class); + classes.add(JcrPageDefinitions.class); Mapper mapper = new AnnotationMapperImpl(classes); return new ObjectContentManagerImpl(session, mapper); Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageDefinitions.java (from r1382759, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageConfiguration.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/JcrPageDefinitions.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageDefinitions.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageConfiguration.java&r1=1382759&r2=1382844&rev=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageConfiguration.java (original) +++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageDefinitions.java Mon Sep 10 13:50:32 2012 @@ -24,7 +24,7 @@ import java.util.List; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node; -import org.apache.rave.portal.web.mvc.config.PageConfiguration; +import org.apache.rave.portal.web.mvc.config.PageDefinitions; import org.apache.rave.portal.web.mvc.config.PageDefinition; import org.apache.rave.portal.web.mvc.config.PageFragment; @@ -32,7 +32,7 @@ import org.apache.rave.portal.web.mvc.co * @version "$Id$" */ @Node(discriminator = false, jcrType = "raveconfig:pageconfiguration") -public class JcrPageConfiguration implements PageConfiguration { +public class JcrPageDefinitions implements PageDefinitions { @Field(path = true, id = true) @@ -72,7 +72,6 @@ public class JcrPageConfiguration implem } - @Override public List<PageFragment> getPageFragments() { return pageFragments; } @@ -92,7 +91,7 @@ public class JcrPageConfiguration implem @Override public String toString() { final StringBuilder sb = new StringBuilder(); - sb.append("JcrPageConfiguration"); + sb.append("JcrPageDefinitions"); sb.append("{name='").append(name).append('\''); sb.append(", path='").append(path).append('\''); sb.append('}'); Propchange: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageDefinitions.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageDefinitions.java ------------------------------------------------------------------------------ svn:keywords = Id Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java (from r1382759, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrUrlMapping.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/JcrRoute.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrUrlMapping.java&r1=1382759&r2=1382844&rev=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrUrlMapping.java (original) +++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java Mon Sep 10 13:50:32 2012 @@ -24,8 +24,7 @@ import java.util.List; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node; -import org.apache.rave.portal.web.mvc.config.PageDefinition; -import org.apache.rave.portal.web.mvc.config.UrlMapping; +import org.apache.rave.portal.web.mvc.config.Route; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,9 +32,9 @@ import org.slf4j.LoggerFactory; * @version "$Id$" */ @Node(discriminator = false, jcrType = "raveconfig:urlmapping", jcrMixinTypes = "mix:referenceable") -public class JcrUrlMapping implements UrlMapping { +public class JcrRoute implements Route { - private static Logger log = LoggerFactory.getLogger(JcrUrlMapping.class); + private static Logger log = LoggerFactory.getLogger(JcrRoute.class); @Field(jcrType = "String") private String url; @@ -43,91 +42,61 @@ public class JcrUrlMapping implements Ur @Field(jcrType = "String") private String page; - - @Field(jcrType = "String") + @Field(jcrType = "action") private String action; - @Field(jcrType = "String") - private String target; - // set by code - private UrlMapping parent; - - // set by code - //@Bean(jcrType = "raveconfig:urlmapping", jcrName = "raveconfig:urlmapping") - private PageDefinition pageDefinition; - @Collection(jcrType = "raveconfig:urlmapping", jcrName = "raveconfig:urlmapping") - private List<UrlMapping> children; + private List<Route> children; @Override - public String getUrl() { + public String getPath() { return url; } @Override - public void setUrl(String url) { + public void setPath(String url) { this.url = url; } @Override - public String getPage() { + public String getTarget() { return page; } @Override - public void setPage(String page) { - this.page = page; - } - - @Override - public UrlMapping getParent() { - return parent; + public void setTarget(String target) { + this.page = target; } @Override - public void setParent(UrlMapping parent) { - this.parent = parent; + public String getAction() { + return action; } @Override - public PageDefinition getPageDefinition() { - return pageDefinition; + public void setAction(final String action) { + this.action = action; } @Override - public void setPageDefinition(PageDefinition pageDefinition) { - this.pageDefinition = pageDefinition; - } - - @Override - public List<UrlMapping> getChildren() { + public List<Route> getChildren() { return children; } @Override - public void setChildren(List<UrlMapping> children) { + public void setChildren(List<Route> children) { this.children = children; } @Override public String toString() { final StringBuilder sb = new StringBuilder(); - sb.append("JcrUrlMapping"); + sb.append("JcrRoute"); sb.append("{url='").append(url).append('\''); sb.append(", page='").append(page).append('\''); - sb.append(", parent=").append(parent); - sb.append(", pageDefinition=").append(pageDefinition); sb.append(", children=").append(children); sb.append('}'); return sb.toString(); } - public String[] getViews() { - // TODO - return null; - } - - public void setViews(String[] views) { - // TODO - } } Propchange: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoute.java ------------------------------------------------------------------------------ svn:keywords = Id Copied: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoutes.java (from r1382759, rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrUrlConfiguration.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/JcrRoutes.java?p2=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoutes.java&p1=rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrUrlConfiguration.java&r1=1382759&r2=1382844&rev=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrUrlConfiguration.java (original) +++ rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoutes.java Mon Sep 10 13:50:32 2012 @@ -25,19 +25,14 @@ import java.util.List; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field; import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node; -import org.apache.rave.portal.web.mvc.config.PageConfiguration; -import org.apache.rave.portal.web.mvc.config.UrlConfiguration; -import org.apache.rave.portal.web.mvc.config.UrlMapping; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.rave.portal.web.mvc.config.Route; +import org.apache.rave.portal.web.mvc.config.Routes; /** * @version "$Id$" */ @Node(discriminator = false, jcrType = "raveconfig:urlconfiguration", jcrMixinTypes = "mix:referenceable") -public class JcrUrlConfiguration implements UrlConfiguration { - - private static Logger log = LoggerFactory.getLogger(JcrUrlConfiguration.class); +public class JcrRoutes implements Routes { @Field(path = true, id = true) private String path; @@ -45,18 +40,13 @@ public class JcrUrlConfiguration impleme @Field(jcrName = "raveconfig:name", jcrType = "String") private String name; - @Collection(elementClassName = JcrUrlMapping.class, jcrType = "raveconfig:urlmapping") - private List<UrlMapping> mappings; - - @Override - public void initialize(PageConfiguration configuration) { - log.info("Initializing URL config"); - } + @Collection(elementClassName = JcrRoute.class, jcrType = "raveconfig:urlmapping") + private List<Route> routes; - public JcrUrlConfiguration() { + public JcrRoutes() { } - public JcrUrlConfiguration(String name) { + public JcrRoutes(String name) { this.name = name; } @@ -72,16 +62,16 @@ public class JcrUrlConfiguration impleme } @Override - public List<UrlMapping> getMappings() { - if (mappings == null) { - return new ArrayList<UrlMapping>(); + public List<Route> getRoutes() { + if (routes == null) { + return new ArrayList<Route>(); } - return mappings; + return routes; } @Override - public void setMappings(List<UrlMapping> mappings) { - this.mappings = mappings; + public void setRoutes(List<Route> routes) { + this.routes = routes; } @@ -96,9 +86,9 @@ public class JcrUrlConfiguration impleme @Override public String toString() { final StringBuilder sb = new StringBuilder(); - sb.append("JcrUrlConfiguration"); + sb.append("JcrRoutes"); sb.append("{name='").append(name).append('\''); - sb.append(",nr of mappings=").append(getMappings().size()); + sb.append(",nr of routes=").append(getRoutes().size()); sb.append('}'); return sb.toString(); } Propchange: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoutes.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrRoutes.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManagerTest.java URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManagerTest.java?rev=1382844&r1=1382843&r2=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManagerTest.java (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManagerTest.java Mon Sep 10 13:50:32 2012 @@ -37,9 +37,9 @@ public class JcrConfigManagerTest extend // // // public void testSaveUrlConfiguration() throws Exception { -// ConfigManager manager = new JcrConfigManager(superuser, CONFIG_ROOT); +// RoutesManager manager = new JcrConfigManager(superuser, CONFIG_ROOT); // // create page config: -// final PageConfiguration configuration = new JcrPageConfiguration(); +// final PageDefinitions configuration = new JcrPageDefinitions(); // final String configName = "myPageConfigName"; // configuration.setName(configName); // final PageDefinition definition = new JcrPageDefinition(); @@ -51,21 +51,21 @@ public class JcrConfigManagerTest extend // manager.saveConfiguration(configuration); // // // final String urlConfigName = "urlConfig"; -// UrlConfiguration urlConfiguration = new JcrUrlConfiguration(urlConfigName); +// Routes urlConfiguration = new JcrRoutes(urlConfigName); // manager.saveUrlConfiguration(urlConfiguration); -// urlConfiguration = manager.getUrlConfig(urlConfigName, configuration); +// urlConfiguration = manager.getRoutes(urlConfigName, configuration); // assertTrue(urlConfiguration != null); // // } // // // public void testSaveConfiguration() throws Exception { -// ConfigManager manager = new JcrConfigManager(superuser, CONFIG_ROOT); -// final PageConfiguration configuration = new JcrPageConfiguration(); +// RoutesManager manager = new JcrConfigManager(superuser, CONFIG_ROOT); +// final PageDefinitions configuration = new JcrPageDefinitions(); // final String configName = "myName"; // configuration.setName(configName); // manager.saveConfiguration(configuration); -// PageConfiguration retrievedConfiguration = manager.loadConfiguration(configName); +// PageDefinitions retrievedConfiguration = manager.getPageDefinitions(configName); // assertTrue(retrievedConfiguration != null); // // add some fragments: // @@ -93,7 +93,7 @@ public class JcrConfigManagerTest extend // // // manager.saveConfiguration(configuration); -// retrievedConfiguration = manager.loadConfiguration(configName); +// retrievedConfiguration = manager.getPageDefinitions(configName); // assertTrue(retrievedConfiguration != null); // final Collection<PageFragment> pageFragments = retrievedConfiguration.getPageFragments(); // assertEquals(pageFragments.size(), 2); Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-configuration.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-configuration.xml?rev=1382844&r1=1382843&r2=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-configuration.xml (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/page-configuration.xml Mon Sep 10 13:50:32 2012 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<configuration name="default"> +<definitions name="default"> <page-definition name="myPage" description="My Page" displayname="My page" controller="org.apache.rave.portal.web.mvc.example.MyPageController"> <page-fragment name="head" controller="org.apache.rave.portal.web.mvc.example.MyHeaderController" viewname="pages/override/myheader"/> @@ -25,4 +25,4 @@ <page-fragment name="footer" controller="org.apache.rave.portal.web.mvc.example.MyFooterController"/> </page-definition> -</configuration> +</definitions> 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=1382844&r1=1382843&r2=1382844&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 13:50:32 2012 @@ -93,13 +93,13 @@ <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-configuration.xml"/> - <property name="urlMappingsPath" value="classpath:url-configuration.xml"/> - <property name="configManager" ref="fileConfigurationManager"/> + <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.FileConfigManager"/> + <bean id="fileConfigurationManager" class="org.apache.rave.portal.web.mvc.config.file.FilePageRoutesManager"/> <bean name="unroutedHandlerMapping" class="org.apache.rave.portal.web.mvc.UnRoutedRequestMappingHandlerMapping"> <property name="order" value="0"/> Modified: rave/sandbox/content-services/rave-web-jcr/src/test/resources/url-configuration.xml URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/test/resources/url-configuration.xml?rev=1382844&r1=1382843&r2=1382844&view=diff ============================================================================== --- rave/sandbox/content-services/rave-web-jcr/src/test/resources/url-configuration.xml (original) +++ rave/sandbox/content-services/rave-web-jcr/src/test/resources/url-configuration.xml Mon Sep 10 13:50:32 2012 @@ -24,7 +24,7 @@ <page-fragment name="footer" path="myFooter" controller="org.apache.rave.portal.web.mvcexample.MyFooterController"/> </page-definition> --> -<url-configuration name="default"> +<url-definitions name="default"> <url-mapping url="/mypage2" page="myPage"/> <url-mapping url="/mypageFoo" page="myPage" views="bar"/> -</url-configuration> +</url-definitions>
