You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/02/15 22:04:33 UTC

[4/7] DELTASPIKE-288 org.apache.deltaspike.jsf.api.config.view.Page -> View

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b6290782/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/Pages.java
index 7174929..0ab2b49 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/Pages.java
@@ -19,13 +19,13 @@
 package org.apache.deltaspike.test.jsf.impl.config.view.navigation.syntax.uc005;
 
 import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.Page;
+import org.apache.deltaspike.jsf.api.config.view.View;
 
-import static org.apache.deltaspike.jsf.api.config.view.Page.NavigationMode.FORWARD;
-import static org.apache.deltaspike.jsf.api.config.view.Page.NavigationMode.REDIRECT;
-import static org.apache.deltaspike.jsf.api.config.view.Page.ViewParameterMode.INCLUDE;
+import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.FORWARD;
+import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.REDIRECT;
+import static org.apache.deltaspike.jsf.api.config.view.View.ViewParameterMode.INCLUDE;
 
-@Page(navigation = REDIRECT)
+@View(navigation = REDIRECT)
 interface Pages extends ViewConfig
 {
     //inherits navigation = REDIRECT
@@ -36,11 +36,12 @@ interface Pages extends ViewConfig
     interface Admin extends Pages
     {
         //inherits navigation = REDIRECT
-        @Page(viewParams = INCLUDE)
+        @View(viewParams = INCLUDE)
         interface Statistics extends Admin
         {
             //inherits navigation = REDIRECT and viewParams = INCLUDE
-            @Page class Index implements Statistics
+            @View
+            class Index implements Statistics
             {
             }
 
@@ -51,12 +52,13 @@ interface Pages extends ViewConfig
         }
 
         //inherits navigation = REDIRECT
-        @Page class Index implements Admin
+        @View
+        class Index implements Admin
         {
         }
 
         //inherits but overrules navigation
-        @Page(navigation = FORWARD)
+        @View(navigation = FORWARD)
         class Home implements Admin
         {
         }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b6290782/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
index 021bdb1..c5b5388 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc005/ViewConfigTest.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
 import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
 import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
 import org.apache.deltaspike.jsf.api.config.view.Folder;
-import org.apache.deltaspike.jsf.api.config.view.Page;
+import org.apache.deltaspike.jsf.api.config.view.View;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigResolverProducer;
 import org.junit.After;
@@ -74,10 +74,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());
@@ -113,10 +113,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.INCLUDE, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.DEFAULT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.INCLUDE, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());
@@ -153,10 +153,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.DEFAULT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());
@@ -194,10 +194,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.DEFAULT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
 
         Assert.assertNotNull(node.getInheritedMetaData());
@@ -217,10 +217,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.FORWARD, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.FORWARD, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());  //not processed at this point - node was just added
@@ -246,10 +246,10 @@ public class ViewConfigTest
         Assert.assertEquals(2, configDescriptor.getMetaData().size());
         Assert.assertEquals(1, configDescriptor.getMetaData(Folder.class).size());
         Assert.assertEquals("/pages/", configDescriptor.getMetaData(Folder.class).iterator().next().name());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, configDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals(Page.Extension.XHTML, configDescriptor.getMetaData(Page.class).iterator().next().extension());
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().name());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, configDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals(View.Extension.XHTML, configDescriptor.getMetaData(View.class).iterator().next().extension());
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().name());
 
 
         configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.Admin.class);
@@ -262,13 +262,13 @@ public class ViewConfigTest
         Assert.assertEquals(2, configDescriptor.getMetaData().size());
         Assert.assertEquals(1, configDescriptor.getMetaData(Folder.class).size());
         Assert.assertEquals("/pages/admin/", configDescriptor.getMetaData(Folder.class).iterator().next().name());
-        Assert.assertEquals(1, configDescriptor.getMetaData(Page.class).size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, configDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        //the following is correct because it's @Page at the folder level:
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().basePath());
-        Assert.assertEquals("xhtml", configDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(1, configDescriptor.getMetaData(View.class).size());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, configDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        //the following is correct because it's @View at the folder level:
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().basePath());
+        Assert.assertEquals("xhtml", configDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.Admin.Statistics.class);
@@ -281,13 +281,13 @@ public class ViewConfigTest
         Assert.assertEquals(2, configDescriptor.getMetaData().size());
         Assert.assertEquals(1, configDescriptor.getMetaData(Folder.class).size());
         Assert.assertEquals("/pages/admin/statistics/", configDescriptor.getMetaData(Folder.class).iterator().next().name());
-        Assert.assertEquals(1, configDescriptor.getMetaData(Page.class).size());   //TODO update uc004 with these lines
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, configDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.INCLUDE, configDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        //the following is correct because it's @Page at the folder level:
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().basePath());
-        Assert.assertEquals("xhtml", configDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(1, configDescriptor.getMetaData(View.class).size());   //TODO update uc004 with these lines
+        Assert.assertEquals(View.NavigationMode.REDIRECT, configDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.INCLUDE, configDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        //the following is correct because it's @View at the folder level:
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().basePath());
+        Assert.assertEquals("xhtml", configDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Index.class);
@@ -298,11 +298,11 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(1, viewConfigDescriptor.getMetaData(Page.class).size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(1, viewConfigDescriptor.getMetaData(View.class).size());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Statistics.Index.class);
@@ -313,10 +313,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.INCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.INCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Statistics.Home.class);
@@ -327,10 +327,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Index.class);
@@ -341,10 +341,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Home.class);
@@ -355,9 +355,9 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.FORWARD, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.FORWARD, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b6290782/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/Pages.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/Pages.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/Pages.java
index 558b31a..3ce5f17 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/Pages.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/Pages.java
@@ -19,16 +19,16 @@
 package org.apache.deltaspike.test.jsf.impl.config.view.navigation.syntax.uc006;
 
 import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.Page;
+import org.apache.deltaspike.jsf.api.config.view.View;
 
-import static org.apache.deltaspike.jsf.api.config.view.Page.Extension.FACES;
-import static org.apache.deltaspike.jsf.api.config.view.Page.Extension.JSF;
-import static org.apache.deltaspike.jsf.api.config.view.Page.Extension.XHTML;
-import static org.apache.deltaspike.jsf.api.config.view.Page.NavigationMode.FORWARD;
-import static org.apache.deltaspike.jsf.api.config.view.Page.NavigationMode.REDIRECT;
-import static org.apache.deltaspike.jsf.api.config.view.Page.ViewParameterMode.INCLUDE;
+import static org.apache.deltaspike.jsf.api.config.view.View.Extension.FACES;
+import static org.apache.deltaspike.jsf.api.config.view.View.Extension.JSF;
+import static org.apache.deltaspike.jsf.api.config.view.View.Extension.XHTML;
+import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.FORWARD;
+import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.REDIRECT;
+import static org.apache.deltaspike.jsf.api.config.view.View.ViewParameterMode.INCLUDE;
 
-@Page(navigation = REDIRECT, extension = JSF)
+@View(navigation = REDIRECT, extension = JSF)
 interface Pages extends ViewConfig
 {
     //inherits navigation = REDIRECT and extension = JSF
@@ -40,11 +40,12 @@ interface Pages extends ViewConfig
     interface Admin extends Pages
     {
         //inherits navigation = REDIRECT
-        @Page(viewParams = INCLUDE, extension = FACES)
+        @View(viewParams = INCLUDE, extension = FACES)
         interface Statistics extends Admin
         {
             //inherits navigation = REDIRECT and viewParams = INCLUDE and extension = FACES
-            @Page class Index implements Statistics
+            @View
+            class Index implements Statistics
             {
             }
 
@@ -55,12 +56,12 @@ interface Pages extends ViewConfig
         }
 
         //inherits navigation = REDIRECT
-        @Page(extension = XHTML) class Index implements Admin
+        @View(extension = XHTML) class Index implements Admin
         {
         }
 
         //inherits but overrules navigation and extension = JSF
-        @Page(navigation = FORWARD) class Home implements Admin
+        @View(navigation = FORWARD) class Home implements Admin
         {
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b6290782/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
index 844689d..5cc02f0 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/navigation/syntax/uc006/ViewConfigTest.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
 import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
 import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
 import org.apache.deltaspike.jsf.api.config.view.Folder;
-import org.apache.deltaspike.jsf.api.config.view.Page;
+import org.apache.deltaspike.jsf.api.config.view.View;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigResolverProducer;
 import org.junit.After;
@@ -74,10 +74,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.JSF, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.JSF, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());
@@ -113,10 +113,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.INCLUDE, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.FACES, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.DEFAULT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.INCLUDE, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.FACES, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());
@@ -153,10 +153,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.DEFAULT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());
@@ -194,10 +194,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.XHTML, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.DEFAULT, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.XHTML, ((View) node.getMetaData().iterator().next()).extension());
 
 
         Assert.assertNotNull(node.getInheritedMetaData());
@@ -217,10 +217,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(node.getMetaData());
         Assert.assertEquals(1, node.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.FORWARD, ((Page) node.getMetaData().iterator().next()).navigation());
-        Assert.assertEquals(Page.ViewParameterMode.DEFAULT, ((Page) node.getMetaData().iterator().next()).viewParams());
-        Assert.assertEquals("", ((Page) node.getMetaData().iterator().next()).name());
-        Assert.assertEquals(Page.Extension.DEFAULT, ((Page) node.getMetaData().iterator().next()).extension());
+        Assert.assertEquals(View.NavigationMode.FORWARD, ((View) node.getMetaData().iterator().next()).navigation());
+        Assert.assertEquals(View.ViewParameterMode.DEFAULT, ((View) node.getMetaData().iterator().next()).viewParams());
+        Assert.assertEquals("", ((View) node.getMetaData().iterator().next()).name());
+        Assert.assertEquals(View.Extension.DEFAULT, ((View) node.getMetaData().iterator().next()).extension());
 
         Assert.assertNotNull(node.getInheritedMetaData());
         Assert.assertEquals(0, node.getInheritedMetaData().size());  //not processed at this point - node was just added
@@ -246,11 +246,11 @@ public class ViewConfigTest
         Assert.assertEquals(2, configDescriptor.getMetaData().size());
         Assert.assertEquals(1, configDescriptor.getMetaData(Folder.class).size());
         Assert.assertEquals("/pages/", configDescriptor.getMetaData(Folder.class).iterator().next().name());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, configDescriptor.getMetaData(Page.class).iterator().next()
+        Assert.assertEquals(View.NavigationMode.REDIRECT, configDescriptor.getMetaData(View.class).iterator().next()
                 .navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals(Page.Extension.JSF, configDescriptor.getMetaData(Page.class).iterator().next().extension());
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().name());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals(View.Extension.JSF, configDescriptor.getMetaData(View.class).iterator().next().extension());
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().name());
 
 
         configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.Admin.class);
@@ -263,13 +263,13 @@ public class ViewConfigTest
         Assert.assertEquals(2, configDescriptor.getMetaData().size());
         Assert.assertEquals(1, configDescriptor.getMetaData(Folder.class).size());
         Assert.assertEquals("/pages/admin/", configDescriptor.getMetaData(Folder.class).iterator().next().name());
-        Assert.assertEquals(1, configDescriptor.getMetaData(Page.class).size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, configDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        //the following is correct because it's @Page at the folder level:
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().basePath());
-        Assert.assertEquals("jsf", configDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(1, configDescriptor.getMetaData(View.class).size());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, configDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, configDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        //the following is correct because it's @View at the folder level:
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().basePath());
+        Assert.assertEquals("jsf", configDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         configDescriptor = viewConfigResolver.getConfigDescriptor(Pages.Admin.Statistics.class);
@@ -282,13 +282,13 @@ public class ViewConfigTest
         Assert.assertEquals(2, configDescriptor.getMetaData().size());
         Assert.assertEquals(1, configDescriptor.getMetaData(Folder.class).size());
         Assert.assertEquals("/pages/admin/statistics/", configDescriptor.getMetaData(Folder.class).iterator().next().name());
-        Assert.assertEquals(1, configDescriptor.getMetaData(Page.class).size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, configDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.INCLUDE, configDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        //the following is correct because it's @Page at the folder level:
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("", configDescriptor.getMetaData(Page.class).iterator().next().basePath());
-        Assert.assertEquals("faces", configDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(1, configDescriptor.getMetaData(View.class).size());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, configDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.INCLUDE, configDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        //the following is correct because it's @View at the folder level:
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("", configDescriptor.getMetaData(View.class).iterator().next().basePath());
+        Assert.assertEquals("faces", configDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Index.class);
@@ -299,11 +299,11 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(1, viewConfigDescriptor.getMetaData(Page.class).size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("jsf", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(1, viewConfigDescriptor.getMetaData(View.class).size());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("jsf", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Statistics.Index.class);
@@ -314,10 +314,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.INCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("faces", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.INCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("faces", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Statistics.Home.class);
@@ -328,10 +328,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("jsf", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("jsf", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Index.class);
@@ -342,10 +342,10 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.REDIRECT, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("index", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("xhtml", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
 
 
         viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(Pages.Admin.Home.class);
@@ -356,9 +356,9 @@ public class ViewConfigTest
 
         Assert.assertNotNull(viewConfigDescriptor.getMetaData());
         Assert.assertEquals(1, viewConfigDescriptor.getMetaData().size());
-        Assert.assertEquals(Page.NavigationMode.FORWARD, viewConfigDescriptor.getMetaData(Page.class).iterator().next().navigation());
-        Assert.assertEquals(Page.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(Page.class).iterator().next().viewParams());
-        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(Page.class).iterator().next().name());
-        Assert.assertEquals("jsf", viewConfigDescriptor.getMetaData(Page.class).iterator().next().extension());
+        Assert.assertEquals(View.NavigationMode.FORWARD, viewConfigDescriptor.getMetaData(View.class).iterator().next().navigation());
+        Assert.assertEquals(View.ViewParameterMode.EXCLUDE, viewConfigDescriptor.getMetaData(View.class).iterator().next().viewParams());
+        Assert.assertEquals("home", viewConfigDescriptor.getMetaData(View.class).iterator().next().name());
+        Assert.assertEquals("jsf", viewConfigDescriptor.getMetaData(View.class).iterator().next().extension());
     }
 }