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

[6/7] git commit: DELTASPIKE-288 org.apache.deltaspike.jsf.api.config.view.controller.PageBean -> ViewControllerBean

DELTASPIKE-288 org.apache.deltaspike.jsf.api.config.view.controller.PageBean -> ViewControllerBean


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/4da21c55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/4da21c55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/4da21c55

Branch: refs/heads/master
Commit: 4da21c55226d58ff6d6c89ea19715a1459d3a332
Parents: b629078
Author: gpetracek <gp...@apache.org>
Authored: Fri Feb 15 20:53:21 2013 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Feb 15 21:48:44 2013 +0100

----------------------------------------------------------------------
 .../jsf/api/config/view/controller/PageBean.java   |   87 ---------------
 .../config/view/controller/ViewControllerBean.java |   87 +++++++++++++++
 .../jsf/api/literal/PageBeanLiteral.java           |   53 ---------
 .../jsf/api/literal/ViewControllerBeanLiteral.java |   53 +++++++++
 .../jsf/impl/config/view/ViewConfigExtension.java  |    4 +-
 .../view/controller/uc001/SimplePageConfig.java    |    4 +-
 .../view/controller/uc001/ViewConfigTest.java      |    8 +-
 .../view/controller/uc002/SimplePageConfig.java    |    4 +-
 .../view/controller/uc002/ViewConfigTest.java      |    8 +-
 .../view/controller/uc003/SimplePageConfig.java    |    1 -
 .../view/controller/uc003/ViewConfigTest.java      |   27 ++---
 .../view/controller/uc004/SimplePageConfig.java    |    4 +-
 .../config/view/controller/uc004/TestSecured.java  |    2 +-
 .../view/controller/uc004/ViewConfigTest.java      |    8 +-
 14 files changed, 173 insertions(+), 177 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/PageBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/PageBean.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/PageBean.java
deleted file mode 100644
index 3a0562e..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/PageBean.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.jsf.api.config.view.controller;
-
-/**
- * Specifies one or more page-beans via the type-safe view-config.
- * Such page beans support e.g. the view-controller annotations.
- */
-
-import org.apache.deltaspike.core.api.config.view.metadata.SimpleCallbackDescriptor;
-import org.apache.deltaspike.core.api.config.view.metadata.annotation.ViewMetaData;
-import org.apache.deltaspike.core.spi.config.view.ConfigPreProcessor;
-import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-//don't use @Inherited
-@Target(TYPE)
-@Retention(RUNTIME)
-@Documented
-
-@ViewMetaData(preProcessor = PageBean.PageBeanConfigPreProcessor.class)
-public @interface PageBean
-{
-    /**
-     * Class of the page-bean
-     *
-     * @return class of the page-bean
-     */
-    Class value();
-
-    /**
-     * Optional name of the page-bean
-     *
-     * @return name of the page-bean
-     */
-    //TODO
-    String name() default "";
-
-    public class PageBeanConfigPreProcessor implements ConfigPreProcessor<PageBean>
-    {
-        @Override
-        public PageBean beforeAddToConfig(PageBean metaData, ViewConfigNode viewConfigNode)
-        {
-            viewConfigNode.registerCallbackDescriptors(
-                    PageBean.class, new ViewControllerDescriptor(metaData.value(), InitView.class));
-            viewConfigNode.registerCallbackDescriptors(
-                    PageBean.class, new ViewControllerDescriptor(metaData.value(), PrePageAction.class));
-            viewConfigNode.registerCallbackDescriptors(
-                    PageBean.class, new ViewControllerDescriptor(metaData.value(), PreRenderView.class));
-            viewConfigNode.registerCallbackDescriptors(
-                    PageBean.class, new ViewControllerDescriptor(metaData.value(), PostRenderView.class));
-            return metaData; //no change needed
-        }
-
-        //not needed outside
-        private class ViewControllerDescriptor extends SimpleCallbackDescriptor<Void>
-        {
-            protected ViewControllerDescriptor(Class beanClass, Class<? extends Annotation> callbackType)
-            {
-                super(beanClass, callbackType);
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerBean.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerBean.java
new file mode 100644
index 0000000..aac3cb6
--- /dev/null
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerBean.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.jsf.api.config.view.controller;
+
+/**
+ * Specifies one or more page-beans via the type-safe view-config.
+ * Such page beans support e.g. the view-controller annotations.
+ */
+
+import org.apache.deltaspike.core.api.config.view.metadata.SimpleCallbackDescriptor;
+import org.apache.deltaspike.core.api.config.view.metadata.annotation.ViewMetaData;
+import org.apache.deltaspike.core.spi.config.view.ConfigPreProcessor;
+import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+//don't use @Inherited
+@Target(TYPE)
+@Retention(RUNTIME)
+@Documented
+
+@ViewMetaData(preProcessor = ViewControllerBean.ViewControllerBeanConfigPreProcessor.class)
+public @interface ViewControllerBean
+{
+    /**
+     * Class of the page-bean
+     *
+     * @return class of the page-bean
+     */
+    Class value();
+
+    /**
+     * Optional name of the page-bean
+     *
+     * @return name of the page-bean
+     */
+    //TODO
+    String name() default "";
+
+    public class ViewControllerBeanConfigPreProcessor implements ConfigPreProcessor<ViewControllerBean>
+    {
+        @Override
+        public ViewControllerBean beforeAddToConfig(ViewControllerBean metaData, ViewConfigNode viewConfigNode)
+        {
+            viewConfigNode.registerCallbackDescriptors(
+                    ViewControllerBean.class, new ViewControllerDescriptor(metaData.value(), InitView.class));
+            viewConfigNode.registerCallbackDescriptors(
+                    ViewControllerBean.class, new ViewControllerDescriptor(metaData.value(), PrePageAction.class));
+            viewConfigNode.registerCallbackDescriptors(
+                    ViewControllerBean.class, new ViewControllerDescriptor(metaData.value(), PreRenderView.class));
+            viewConfigNode.registerCallbackDescriptors(
+                    ViewControllerBean.class, new ViewControllerDescriptor(metaData.value(), PostRenderView.class));
+            return metaData; //no change needed
+        }
+
+        //not needed outside
+        private class ViewControllerDescriptor extends SimpleCallbackDescriptor<Void>
+        {
+            protected ViewControllerDescriptor(Class beanClass, Class<? extends Annotation> callbackType)
+            {
+                super(beanClass, callbackType);
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/PageBeanLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/PageBeanLiteral.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/PageBeanLiteral.java
deleted file mode 100644
index c6f3609..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/PageBeanLiteral.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.deltaspike.jsf.api.literal;
-
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
-
-import javax.enterprise.util.AnnotationLiteral;
-
-/**
- * Literal for {@link PageBean}
- */
-public class PageBeanLiteral extends AnnotationLiteral<PageBean> implements PageBean
-{
-    private static final long serialVersionUID = 8582580975876369665L;
-
-    private final Class value;
-    private final String name;
-
-    public PageBeanLiteral(Class value, String name)
-    {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public Class value()
-    {
-        return this.value;
-    }
-
-    @Override
-    public String name()
-    {
-        return this.name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerBeanLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerBeanLiteral.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerBeanLiteral.java
new file mode 100644
index 0000000..42fee80
--- /dev/null
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerBeanLiteral.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.deltaspike.jsf.api.literal;
+
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+/**
+ * Literal for {@link org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean}
+ */
+public class ViewControllerBeanLiteral extends AnnotationLiteral<ViewControllerBean> implements ViewControllerBean
+{
+    private static final long serialVersionUID = 8582580975876369665L;
+
+    private final Class value;
+    private final String name;
+
+    public ViewControllerBeanLiteral(Class value, String name)
+    {
+        this.value = value;
+        this.name = name;
+    }
+
+    @Override
+    public Class value()
+    {
+        return this.value;
+    }
+
+    @Override
+    public String name()
+    {
+        return this.name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
index d4e3ea6..f94fe2e 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/ViewConfigExtension.java
@@ -28,7 +28,7 @@ import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
 import org.apache.deltaspike.core.spi.config.view.ViewConfigRoot;
 import org.apache.deltaspike.core.util.ClassDeactivationUtils;
 import org.apache.deltaspike.core.util.ExceptionUtils;
-import org.apache.deltaspike.jsf.api.literal.PageBeanLiteral;
+import org.apache.deltaspike.jsf.api.literal.ViewControllerBeanLiteral;
 import org.apache.deltaspike.jsf.impl.util.ViewConfigUtils;
 
 import javax.enterprise.event.Observes;
@@ -110,7 +110,7 @@ public class ViewConfigExtension implements Extension, Deactivatable
                         }
                     }
 
-                    viewConfigNode.getInheritedMetaData().add(new PageBeanLiteral(configClass, null));
+                    viewConfigNode.getInheritedMetaData().add(new ViewControllerBeanLiteral(configClass, null));
                 }
                 break;
             }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/SimplePageConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/SimplePageConfig.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/SimplePageConfig.java
index a8e97a5..eea409f 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/SimplePageConfig.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/SimplePageConfig.java
@@ -19,9 +19,9 @@
 package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc001;
 
 import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 
-@PageBean(PageBean001.class)
+@ViewControllerBean(PageBean001.class)
 class SimplePageConfig implements ViewConfig
 {
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTest.java
index 680b960..efc7684 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc001/ViewConfigTest.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc001;
 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.controller.PageBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 import org.apache.deltaspike.jsf.api.config.view.controller.PreRenderView;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigResolverProducer;
@@ -86,8 +86,8 @@ public class ViewConfigTest
         ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(SimplePageConfig.class);
 
         Assert.assertNotNull(viewConfigDescriptor);
-        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class));
-        Assert.assertEquals(PageBean001.class, viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class).getCallbackMethods().keySet().iterator().next());
-        Assert.assertEquals("preRenderViewCallbackMethod", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
+        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class));
+        Assert.assertEquals(PageBean001.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class).getCallbackMethods().keySet().iterator().next());
+        Assert.assertEquals("preRenderViewCallbackMethod", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/SimplePageConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/SimplePageConfig.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/SimplePageConfig.java
index e3d73a8..64431b4 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/SimplePageConfig.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/SimplePageConfig.java
@@ -19,9 +19,9 @@
 package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc002;
 
 import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 
-@PageBean(value = PageBean002.class, name = "pageBean" /*TODO*/) //e.g. in case of producers with different @Named(...)
+@ViewControllerBean(value = PageBean002.class, name = "pageBean" /*TODO*/) //e.g. in case of producers with different @Named(...)
 class SimplePageConfig implements ViewConfig
 {
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTest.java
index bbae8e6..95c24b4 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc002/ViewConfigTest.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc002;
 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.controller.PageBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 import org.apache.deltaspike.jsf.api.config.view.controller.PostRenderView;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigResolverProducer;
@@ -86,8 +86,8 @@ public class ViewConfigTest
         ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(SimplePageConfig.class);
 
         Assert.assertNotNull(viewConfigDescriptor);
-        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PostRenderView.class));
-        Assert.assertEquals(PageBean002.class, viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PostRenderView.class).getCallbackMethods().keySet().iterator().next());
-        Assert.assertEquals("postRenderViewCallbackMethod", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PostRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
+        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PostRenderView.class));
+        Assert.assertEquals(PageBean002.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PostRenderView.class).getCallbackMethods().keySet().iterator().next());
+        Assert.assertEquals("postRenderViewCallbackMethod", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PostRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/SimplePageConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/SimplePageConfig.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/SimplePageConfig.java
index ae778db..2af9edf 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/SimplePageConfig.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/SimplePageConfig.java
@@ -19,7 +19,6 @@
 package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc003;
 
 import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
 
 class SimplePageConfig implements ViewConfig
 {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTest.java
index 049496d..a3de3d4 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc003/ViewConfigTest.java
@@ -21,11 +21,8 @@ package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc003;
 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.controller.InitView;
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
-import org.apache.deltaspike.jsf.api.config.view.controller.PostRenderView;
-import org.apache.deltaspike.jsf.api.config.view.controller.PrePageAction;
-import org.apache.deltaspike.jsf.api.config.view.controller.PreRenderView;
+import org.apache.deltaspike.jsf.api.config.view.controller.*;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigResolverProducer;
 import org.junit.After;
@@ -104,18 +101,18 @@ public class ViewConfigTest
         ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(SimplePageConfig.class);
 
         Assert.assertNotNull(viewConfigDescriptor);
-        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, InitView.class));
-        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PrePageAction.class));
-        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class));
-        Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PostRenderView.class));
+        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, InitView.class));
+        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PrePageAction.class));
+        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class));
+        Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PostRenderView.class));
 
-        Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(PageBean.class, InitView.class).getCallbackMethods().keySet().iterator().next());
-        Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(PageBean.class, InitView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
+        Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, InitView.class).getCallbackMethods().keySet().iterator().next());
+        Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, InitView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
 
-        Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PrePageAction.class).getCallbackMethods().keySet().iterator().next());
-        Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PrePageAction.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
+        Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PrePageAction.class).getCallbackMethods().keySet().iterator().next());
+        Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PrePageAction.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
 
-        Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class).getCallbackMethods().keySet().iterator().next());
-        Assert.assertEquals("callbackMethod2", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
+        Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class).getCallbackMethods().keySet().iterator().next());
+        Assert.assertEquals("callbackMethod2", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/SimplePageConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/SimplePageConfig.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/SimplePageConfig.java
index 3785b73..e7b49e0 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/SimplePageConfig.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/SimplePageConfig.java
@@ -19,9 +19,9 @@
 package org.apache.deltaspike.test.jsf.impl.config.view.controller.uc004;
 
 import org.apache.deltaspike.core.api.config.view.ViewConfig;
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 
-@PageBean(PageBean004.class)
+@ViewControllerBean(PageBean004.class)
 @TestSecured(SimpleTestAccessDecisionVoter.class)
 public class SimplePageConfig implements ViewConfig
 {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/TestSecured.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/TestSecured.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/TestSecured.java
index d3c9970..7a3ea00 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/TestSecured.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/TestSecured.java
@@ -48,7 +48,7 @@ public @interface TestSecured
     {
         //for a real implementation see e.g.:
         //org.apache.deltaspike.security.api.authorization.annotation.Secured
-        //org.apache.deltaspike.jsf.api.config.view.controller.PageBean
+        //org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean
         @Override
         public TestSecured beforeAddToConfig(TestSecured metaData, ViewConfigNode viewConfigNode)
         {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4da21c55/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/ViewConfigTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/ViewConfigTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/ViewConfigTest.java
index 2abb4ea..ab7ecea 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/ViewConfigTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/config/view/controller/uc004/ViewConfigTest.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
 import org.apache.deltaspike.core.api.config.view.metadata.annotation.DefaultCallback;
 import org.apache.deltaspike.core.spi.config.view.ViewConfigNode;
 import org.apache.deltaspike.jsf.api.config.view.controller.InitView;
-import org.apache.deltaspike.jsf.api.config.view.controller.PageBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean;
 import org.apache.deltaspike.jsf.api.config.view.controller.PreRenderView;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigExtension;
 import org.apache.deltaspike.jsf.impl.config.view.ViewConfigResolverProducer;
@@ -80,7 +80,7 @@ public class ViewConfigTest
 
         Iterator<Annotation> metaDataIterator = node.getMetaData().iterator();
         List<Class<? extends Annotation>> possibleMetaDataTypes = new ArrayList<Class<? extends Annotation>>();
-        possibleMetaDataTypes.add(PageBean.class);
+        possibleMetaDataTypes.add(ViewControllerBean.class);
         possibleMetaDataTypes.add(TestSecured.class);
         Class<? extends Annotation> foundMetaData = metaDataIterator.next().annotationType();
         possibleMetaDataTypes.remove(foundMetaData);
@@ -106,8 +106,8 @@ public class ViewConfigTest
         ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(SimplePageConfig.class);
 
         Assert.assertNotNull(viewConfigDescriptor);
-        Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, InitView.class));
-        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(PageBean.class, PreRenderView.class));
+        Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, InitView.class));
+        Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class));
         Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(TestSecured.class));
     }