Author: ard
Date: Mon Sep 10 14:21:32 2012
New Revision: 1382866

URL: http://svn.apache.org/viewvc?rev=1382866&view=rev
Log:
RAVE-695 further clean up of not yet supported methods, and aligning names

Added:
    
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
   (contents, props changed)
      - copied, changed from r1382844, 
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml
Removed:
    
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml
Modified:
    
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
    
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml
    
rave/sandbox/content-services/rave-jcr-console/src/main/java/org/apache/rave/jcr/console/dialog/JsonExportDialog.html
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.java
    
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.java
    
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
    
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrConfigManager.java
    
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java

Modified: 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
 (original)
+++ 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
 Mon Sep 10 14:21:32 2012
@@ -178,12 +178,12 @@
   </bean>
   -->
 
-  <!-- Inline replacement of Spring <mvc:view-controller/> -->
+  <!-- Inline replacement of Spring <mvc:viewName-controller/> -->
   <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 -->
+        <!-- Forwards requests to the "/" resource to the "page" viewName -->
         <entry key="/">
           <bean 
class="org.springframework.web.servlet.mvc.ParameterizableViewController">
             <property name="viewName" value="page"/>
@@ -255,8 +255,8 @@
     </property>
   </bean>
 
-  <!-- Resolves view names to protected .jsp resources within the 
/WEB-INF/views directory -->
-  <bean 
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+  <!-- Resolves viewName names to protected .jsp resources within the 
/WEB-INF/views directory -->
+  <bean 
class="org.springframework.web.servlet.viewName.InternalResourceViewResolver">
     <property name="prefix" value="/WEB-INF/jsp/views/"/>
     <property name="suffix" value=".jsp"/>
   </bean>
@@ -271,7 +271,7 @@
     <oxm:class-to-be-bound 
name="org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper"/>
   </oxm:jaxb2-marshaller>
 
-  <bean id="tilesConfigurer" 
class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
+  <bean id="tilesConfigurer" 
class="org.springframework.web.servlet.viewName.tiles2.TilesConfigurer">
     <property name="definitions">
       <list>
         <value>/WEB-INF/tiles-defs.xml</value>
@@ -279,8 +279,8 @@
     </property>
   </bean>
 
-  <bean id="tilesViewResolver" 
class="org.springframework.web.servlet.view.UrlBasedViewResolver" p:order="0">
-    <property name="viewClass" 
value="org.springframework.web.servlet.view.tiles2.TilesView"/>
+  <bean id="tilesViewResolver" 
class="org.springframework.web.servlet.viewName.UrlBasedViewResolver" 
p:order="0">
+    <property name="viewClass" 
value="org.springframework.web.servlet.viewName.tiles2.TilesView"/>
   </bean>
 
 </beans>

Modified: 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml
 (original)
+++ 
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/page-configuration.xml
 Mon Sep 10 14:21:32 2012
@@ -19,13 +19,13 @@
   -->
 <definitions name="default">
 
-  <page-definition name="userPage" view="pages/userpage/page" 
controller="org.apache.rave.portal.web.mvc.controller.UserPageController">
-    <page-fragment name="header" view="pages/userpage/page-header" 
controller="org.apache.rave.portal.web.mvc.controller.PageHeaderController"/>
-    <page-fragment name="body" view="pages/userpage/page-body">
-      <page-fragment name="tabs" view="pages/userpage/page-tabs"/>
-      <page-fragment name="content" view="pages/userpage/page-content"/>
+  <page-definition name="userPage" viewName="pages/userpage/page" 
controller="org.apache.rave.portal.web.mvc.controller.UserPageController">
+    <page-fragment name="header" viewName="pages/userpage/page-header" 
controller="org.apache.rave.portal.web.mvc.controller.PageHeaderController"/>
+    <page-fragment name="body" viewName="pages/userpage/page-body">
+      <page-fragment name="tabs" viewName="pages/userpage/page-tabs"/>
+      <page-fragment name="content" viewName="pages/userpage/page-content"/>
     </page-fragment>
-    <page-fragment name="footer" view="pages/footer"/>
+    <page-fragment name="footer" viewName="pages/footer"/>
   </page-definition>
 
 </definitions>

Modified: 
rave/sandbox/content-services/rave-jcr-console/src/main/java/org/apache/rave/jcr/console/dialog/JsonExportDialog.html
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-console/src/main/java/org/apache/rave/jcr/console/dialog/JsonExportDialog.html?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-jcr-console/src/main/java/org/apache/rave/jcr/console/dialog/JsonExportDialog.html
 (original)
+++ 
rave/sandbox/content-services/rave-jcr-console/src/main/java/org/apache/rave/jcr/console/dialog/JsonExportDialog.html
 Mon Sep 10 14:21:32 2012
@@ -26,8 +26,8 @@
             </a>
         </li>
         <li style="padding-top: 4px;">
-            <a wicket:id="view-link">
-                - <span wicket:id="view-link-text"/>
+            <a wicket:id="viewName-link">
+                - <span wicket:id="viewName-link-text"/>
             </a>
         </li>
     </ul>

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageFragment.java
 Mon Sep 10 14:21:32 2012
@@ -31,7 +31,7 @@ public interface PageFragment {
      *
      * @return view name or <code>null</code> if not set
      */
-    String getView();
+    String getViewName();
 
     /**
      * @return the name of the fragment which is unique amongst the {@link 
PageFragment} siblings. Not allowed not be <code>null</code>
@@ -39,9 +39,15 @@ public interface PageFragment {
     String getName();
 
     /**
+     *
+     * @return the description of the fragment or <code>null</code> when no 
description present
+     */
+    String getDescription();
+
+    /**
      * Returns the fully qualified classname of the controller class which is 
annotated with org.springframework.stereotype @Controller. 
      * When this {@link PageFragment} does not need an explicit controller but 
is merely meant to surf as a renderer through
-     * {@link #getView}, <code>null</code> can be returned
+     * {@link #getViewName}, <code>null</code> can be returned
      * @return the fully qualified classname of the controller class, or 
<code>EMPTY</code> String or <code>null</code> when there is no specific 
controller 
      * configured
      */

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PageRoutesManagerImpl.java
 Mon Sep 10 14:21:32 2012
@@ -35,16 +35,6 @@ public class PageRoutesManagerImpl imple
     }
 
     @Override
-    public void saveConfiguration(final PageDefinitions definitions) {
-        //To change body of implemented methods use File | Settings | File 
Templates.
-    }
-
-    @Override
-    public void saveUrlConfiguration(final Routes configuration) {
-        //To change body of implemented methods use File | Settings | File 
Templates.
-    }
-
-    @Override
     public long lastModified() {
         return delegatee.lastModified();
     }

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.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/FilePageFragment.java?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageFragment.java
 Mon Sep 10 14:21:32 2012
@@ -34,8 +34,9 @@ import org.apache.rave.portal.web.mvc.co
 public class FilePageFragment implements PageFragment {
 
     private String name;
+    private String description;
     private String extend;
-    private String view;
+    private String viewName;
 
     private String controller;
     private List<PageFragment> children;
@@ -50,12 +51,12 @@ public class FilePageFragment implements
 
     @XmlAttribute
     @Override
-    public String getView() {
-        return view;
+    public String getViewName() {
+        return viewName;
     }
 
-    public void setView(String view) {
-        this.view = view;
+    public void setViewName(String viewName) {
+        this.viewName = viewName;
     }
 
     @XmlAttribute
@@ -91,6 +92,16 @@ public class FilePageFragment implements
 
     @XmlAttribute
     @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    @XmlAttribute
+    @Override
     public String getExtend() {
         return extend;
     }

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.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/FilePageRoutesManager.java?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/file/FilePageRoutesManager.java
 Mon Sep 10 14:21:32 2012
@@ -150,17 +150,6 @@ public class FilePageRoutesManager imple
         }
     }
 
-
-    @Override
-    public void saveConfiguration(PageDefinitions definitions) {
-        throw new IllegalStateException("Not supported");
-    }
-
-    @Override
-    public void saveUrlConfiguration(Routes configuration) {
-        throw new IllegalStateException("Not supported");
-    }
-
     public long lastModified() {
         try {
             Resource resource1 = resourceLoader.getResource(urlMappingsPath);

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/file/JaxbMappingsTest.java
 Mon Sep 10 14:21:32 2012
@@ -49,12 +49,12 @@ public class JaxbMappingsTest {
 
             assertEquals("default", filePageDefinitions.getName());
             assertEquals(1, filePageDefinitions.getPageDefinitions().size());
-            assertNull("There should be no standalone fragments in 
'"+testSrc+"'.", ((FilePageDefinitions)filePageDefinitions).getPageFragments());
+            assertNull("There should be no standalone fragments in '" + 
testSrc + "'.", ((FilePageDefinitions) filePageDefinitions).getPageFragments());
 
             final PageDefinition pageDefinition = 
filePageDefinitions.getPageDefinitions().get(0);
             assertEquals("top", pageDefinition.getName());
             assertNull(pageDefinition.getExtend());
-            assertNull(pageDefinition.getView());
+            assertNull(pageDefinition.getViewName());
             assertEquals("org.apache.rave.unittest.NonExistingController", 
pageDefinition.getController());
             assertEquals(3, pageDefinition.getChildren().size());
 
@@ -67,7 +67,7 @@ public class JaxbMappingsTest {
                 assertEquals("sub1-nocontroller", sub1.getName());
                 assertNull(sub1.getController());
                 assertNull(sub1.getExtend());
-                assertNull(sub1.getView());
+                assertNull(sub1.getViewName());
                 assertNull(sub1.getChildren());
             }
 
@@ -82,14 +82,14 @@ public class JaxbMappingsTest {
                 assertEquals("sub2-emptycontrollor", sub2.getName());
                 assertEquals("",sub2.getController());
                 assertNull(sub2.getExtend());
-                assertNull(sub2.getView());
+                assertNull(sub2.getViewName());
                 assertEquals( 1, sub2.getChildren().size());
 
                 final PageFragment sub2sub1 = sub2.getChildren().get(0);
                 assertEquals("sub2sub1-withcontroller", sub2sub1.getName());
                 
assertEquals("org.apache.rave.unittest.NonExistingController",sub2sub1.getController());
                 assertNull(sub2sub1.getExtend());
-                assertNull(sub2sub1.getView());
+                assertNull(sub2sub1.getViewName());
                 assertNull(sub2sub1.getChildren());
             }
             
@@ -104,14 +104,14 @@ public class JaxbMappingsTest {
                 assertEquals("sub3-withcontroller-withview", sub3.getName());
                 
assertEquals("org.apache.rave.unittest.NonExistingController",sub3.getController());
                 assertNull(sub3.getExtend());
-                assertEquals("pages/test", sub3.getView());
+                assertEquals("pages/test", sub3.getViewName());
                 assertEquals( 1, sub3.getChildren().size());
 
                 final PageFragment sub3sub1 = sub3.getChildren().get(0);
                 assertEquals("sub3sub1-withextend", sub3sub1.getName());
                 
assertEquals("org.apache.rave.unittest.NonExistingController",sub3sub1.getController());
                 assertEquals("some/fragment", sub3sub1.getExtend());
-                assertNull(sub3sub1.getView());
+                assertNull(sub3sub1.getViewName());
                 assertNull(sub3sub1.getChildren());
             }
        
@@ -131,7 +131,7 @@ public class JaxbMappingsTest {
             final PageDefinition pageDefinition = 
filePageDefinitions.getPageDefinitions().get(0);
             assertEquals("root-one", pageDefinition.getName());
             assertNull(pageDefinition.getExtend());
-            assertNull(pageDefinition.getView());
+            assertNull(pageDefinition.getViewName());
             assertEquals("org.apache.rave.unittest.NonExistingController", 
pageDefinition.getController());
             assertEquals(1, pageDefinition.getChildren().size());
         }
@@ -140,7 +140,7 @@ public class JaxbMappingsTest {
             final PageDefinition pageDefinition = 
filePageDefinitions.getPageDefinitions().get(1);
             assertEquals("root-two", pageDefinition.getName());
             assertNull(pageDefinition.getExtend());
-            assertNull(pageDefinition.getView());
+            assertNull(pageDefinition.getViewName());
             assertEquals("org.apache.rave.unittest.NonExistingController", 
pageDefinition.getController());
             assertEquals(1, pageDefinition.getChildren().size());
         }
@@ -165,14 +165,14 @@ public class JaxbMappingsTest {
             final PageFragment pageFragment = 
((FilePageDefinitions)filePageDefinitions).getPageFragments().get(0);
             assertEquals("fragment-emptycontrollor", pageFragment.getName());
             assertNull(pageFragment.getExtend());
-            assertNull(pageFragment.getView());
+            assertNull(pageFragment.getViewName());
             assertEquals("", pageFragment.getController());
             assertEquals(1, pageFragment.getChildren().size());
 
             final PageFragment pageFragmentSub = 
pageFragment.getChildren().get(0);
             assertEquals("fragmentsub-withcontroller", 
pageFragmentSub.getName());
             assertNull(pageFragmentSub.getExtend());
-            assertNull(pageFragmentSub.getView());
+            assertNull(pageFragmentSub.getViewName());
             assertEquals("org.apache.rave.unittest.NonExistingController", 
pageFragmentSub.getController());
             assertNull(pageFragmentSub.getChildren());
         }

Copied: 
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
 (from r1382844, 
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-definitions.xml?p2=rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml&p1=rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-configuration.xml&r1=1382844&r2=1382866&rev=1382866&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-definitions.xml
 Mon Sep 10 14:21:32 2012
@@ -20,7 +20,7 @@
 <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"/>
+    <page-fragment name="head" 
controller="org.apache.rave.portal.web.mvc.example.MyHeaderController" 
viewName="pages/override/myheader"/>
     <page-fragment name="body" 
controller="org.apache.rave.portal.web.mvc.example.MyContentController"/>
     <page-fragment name="footer" 
controller="org.apache.rave.portal.web.mvc.example.MyFooterController"/>
   </page-definition>

Propchange: 
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/page-definitions.xml
------------------------------------------------------------------------------
    svn:keywords = Id

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=1382866&r1=1382865&r2=1382866&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 14:21:32 2012
@@ -84,45 +84,6 @@ public class JcrConfigManager implements
         return definitions;
     }
 
-    @Override
-    public void saveUrlConfiguration(Routes configuration) {
-        if (configuration == 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: Routes with name: {}, path: {} already exist, 
will be deleted", configurationName, path);
-            manager.remove(path);
-        }
-        // initialize root path:
-        initConfigRoot();
-        ((JcrRoutes) configuration).setPath(path);
-        manager.insert(configuration);
-        manager.save();
-    }
-
-    @Override
-    public void saveConfiguration(PageDefinitions definitions) {
-        if (definitions == null) {
-            throw new IllegalArgumentException("PageDefinitions must not be 
null");
-        }
-        final String configurationName = definitions.getName();
-        final String path = configPath + '/' + configurationName;
-        final Object existing = manager.getObject(path);
-        if (existing != null) {
-            log.info("@DELETING: Configuration with name: {}, path: {} already 
exist, will be deleted", configurationName, path);
-            manager.remove(path);
-        }
-        // initialize root path:
-        initConfigRoot();
-        // set path:
-        ((JcrPageDefinitions) definitions).setPath(path);
-        manager.insert(definitions);
-        manager.save();
-    }
-
     private void initConfigRoot() {
         try {
             if (!session.nodeExists(configPath)) {

Modified: 
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.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/JcrPageFragment.java?rev=1382866&r1=1382865&r2=1382866&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPageFragment.java
 Mon Sep 10 14:21:32 2012
@@ -53,7 +53,10 @@ public class JcrPageFragment implements 
     @Field(jcrType = "String")
     private String controller;
     @Field(jcrType = "String")
-    private String view;
+    private String viewName;
+
+    @Field(jcrType = "String")
+    private String description;
 
     @Field(jcrType = "String", id=true)
     private String name;
@@ -79,12 +82,12 @@ public class JcrPageFragment implements 
     }
 
     @Override
-    public String getView() {
-        return view;
+    public String getViewName() {
+        return viewName;
     }
 
-    public void setView(String view) {
-        this.view = view;
+    public void setViewName(String viewName) {
+        this.viewName = viewName;
     }
 
     public void setPath(String path) {
@@ -101,6 +104,15 @@ public class JcrPageFragment implements 
     }
 
     @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
     public String getExtend() {
         return extend;
     }


Reply via email to