Author: ard
Date: Mon Sep 10 14:23:34 2012
New Revision: 1382872
URL: http://svn.apache.org/viewvc?rev=1382872&view=rev
Log:
RAVE-695 further clean up of not yet supported methods, and aligning names
Modified:
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/main/java/org/apache/rave/portal/web/mvc/config/RoutesManager.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
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=1382872&r1=1382871&r2=1382872&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 14:23:34 2012
@@ -279,7 +279,7 @@ public class RoutedRequestMappingHandler
private NestedHandlerMethod getNestedHandlerMethodForFragment(Object
handler, Method method, PageFragment fragment, String action) {
NestedHandlerConfigImpl config = new NestedHandlerConfigImpl();
config.setName(fragment.getName());
- config.setView(fragment.getView());
+ config.setView(fragment.getViewName());
config.setMethod(new NestedHandlerMethod(handler, method, config));
final List<PageFragment> children = fragment.getChildren();
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/RoutesManager.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/RoutesManager.java?rev=1382872&r1=1382871&r2=1382872&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/RoutesManager.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/RoutesManager.java
Mon Sep 10 14:23:34 2012
@@ -36,15 +36,6 @@ public interface RoutesManager {
Routes getRoutes() throws InvalidConfigurationException;
/**
- * Saves definitions. An existing definitions will be overwritten
- *
- * @param definitions instance of PageDefinitions
- */
- void saveConfiguration(PageDefinitions definitions);
-
- void saveUrlConfiguration(Routes configuration);
-
- /**
* @return the lastModified timestamp in ms since epoch.
*/
long lastModified();
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml?rev=1382872&r1=1382871&r2=1382872&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/jaxbmappings/singlePageDefinition.xml
Mon Sep 10 14:23:34 2012
@@ -27,7 +27,7 @@
<page-fragment name="sub2-emptycontrollor" controller="">
<page-fragment name="sub2sub1-withcontroller"
controller="org.apache.rave.unittest.NonExistingController"/>
</page-fragment>
- <page-fragment name="sub3-withcontroller-withview" view="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
+ <page-fragment name="sub3-withcontroller-withview" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
<page-fragment name="sub3sub1-withextend" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</page-fragment>
</page-definition>
