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/03/31 15:05:31 UTC
[2/2] git commit: DELTASPIKE-288
org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean ->
ViewControllerRef
DELTASPIKE-288 org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerBean -> ViewControllerRef
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/ee250aae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/ee250aae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/ee250aae
Branch: refs/heads/master
Commit: ee250aae7af4377727aeda821ba480bd780c34fe
Parents: ae8e604
Author: gpetracek <gp...@apache.org>
Authored: Sun Mar 31 14:48:14 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Sun Mar 31 15:04:59 2013 +0200
----------------------------------------------------------------------
.../config/view/controller/ViewControllerBean.java | 87 --------------
.../config/view/controller/ViewControllerRef.java | 90 +++++++++++++++
.../jsf/api/literal/ViewControllerBeanLiteral.java | 53 ---------
.../jsf/api/literal/ViewControllerRefLiteral.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/ViewConfigTest.java | 20 ++--
.../view/controller/uc004/SimplePageConfig.java | 4 +-
.../config/view/controller/uc004/TestSecured.java | 2 +-
.../view/controller/uc004/ViewConfigTest.java | 8 +-
13 files changed, 174 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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
deleted file mode 100644
index 071eeca..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerBean.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 = ViewControllerBean.AnnotationPreProcessor.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 "";
-
- class AnnotationPreProcessor implements ConfigPreProcessor<ViewControllerBean>
- {
- @Override
- public ViewControllerBean beforeAddToConfig(ViewControllerBean metaData, ViewConfigNode viewConfigNode)
- {
- viewConfigNode.registerCallbackDescriptors(
- ViewControllerBean.class, new Descriptor(metaData.value(), InitView.class));
- viewConfigNode.registerCallbackDescriptors(
- ViewControllerBean.class, new Descriptor(metaData.value(), PreViewAction.class));
- viewConfigNode.registerCallbackDescriptors(
- ViewControllerBean.class, new Descriptor(metaData.value(), PreRenderView.class));
- viewConfigNode.registerCallbackDescriptors(
- ViewControllerBean.class, new Descriptor(metaData.value(), PostRenderView.class));
- return metaData; //no change needed
- }
- }
-
- //not needed outside
- static class Descriptor extends SimpleCallbackDescriptor<Void>
- {
- protected Descriptor(Class beanClass, Class<? extends Annotation> callbackType)
- {
- super(beanClass, callbackType);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerRef.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerRef.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerRef.java
new file mode 100644
index 0000000..160b4d8
--- /dev/null
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/view/controller/ViewControllerRef.java
@@ -0,0 +1,90 @@
+/*
+ * 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 = ViewControllerRef.AnnotationPreProcessor.class)
+public @interface ViewControllerRef
+{
+ /**
+ * Class of the page-bean
+ *
+ * @return class of the page-bean
+ */
+ Class value();
+
+ /**
+ * Currently not implemented
+ *
+ *
+ * Optional name of the page-bean
+ *
+ * @return name of the page-bean
+ */
+ //TODO
+ String name() default "";
+
+ class AnnotationPreProcessor implements ConfigPreProcessor<ViewControllerRef>
+ {
+ @Override
+ public ViewControllerRef beforeAddToConfig(ViewControllerRef metaData, ViewConfigNode viewConfigNode)
+ {
+ viewConfigNode.registerCallbackDescriptors(
+ ViewControllerRef.class, new Descriptor(metaData.value(), InitView.class));
+ viewConfigNode.registerCallbackDescriptors(
+ ViewControllerRef.class, new Descriptor(metaData.value(), PreViewAction.class));
+ viewConfigNode.registerCallbackDescriptors(
+ ViewControllerRef.class, new Descriptor(metaData.value(), PreRenderView.class));
+ viewConfigNode.registerCallbackDescriptors(
+ ViewControllerRef.class, new Descriptor(metaData.value(), PostRenderView.class));
+ return metaData; //no change needed
+ }
+ }
+
+ //not needed outside
+ static class Descriptor extends SimpleCallbackDescriptor<Void>
+ {
+ protected Descriptor(Class beanClass, Class<? extends Annotation> callbackType)
+ {
+ super(beanClass, callbackType);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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
deleted file mode 100644
index 42fee80..0000000
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerBeanLiteral.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.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/ee250aae/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerRefLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerRefLiteral.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerRefLiteral.java
new file mode 100644
index 0000000..890a67c
--- /dev/null
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/literal/ViewControllerRefLiteral.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.ViewControllerRef;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+/**
+ * Literal for {@link org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef}
+ */
+public class ViewControllerRefLiteral extends AnnotationLiteral<ViewControllerRef> implements ViewControllerRef
+{
+ private static final long serialVersionUID = 8582580975876369665L;
+
+ private final Class value;
+ private final String name;
+
+ public ViewControllerRefLiteral(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/ee250aae/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 f94fe2e..ec5eaeb 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.ViewControllerBeanLiteral;
+import org.apache.deltaspike.jsf.api.literal.ViewControllerRefLiteral;
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 ViewControllerBeanLiteral(configClass, null));
+ viewConfigNode.getInheritedMetaData().add(new ViewControllerRefLiteral(configClass, null));
}
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 eea409f..f77a03e 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.ViewControllerBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef;
-@ViewControllerBean(PageBean001.class)
+@ViewControllerRef(PageBean001.class)
class SimplePageConfig implements ViewConfig
{
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 efc7684..e18c68d 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.ViewControllerBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef;
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(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());
+ Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class));
+ Assert.assertEquals(PageBean001.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class).getCallbackMethods().keySet().iterator().next());
+ Assert.assertEquals("preRenderViewCallbackMethod", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 64431b4..6c7c5d5 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.ViewControllerBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef;
-@ViewControllerBean(value = PageBean002.class, name = "pageBean" /*TODO*/) //e.g. in case of producers with different @Named(...)
+@ViewControllerRef(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/ee250aae/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 95c24b4..82b15ad 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.ViewControllerBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef;
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(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());
+ Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PostRenderView.class));
+ Assert.assertEquals(PageBean002.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PostRenderView.class).getCallbackMethods().keySet().iterator().next());
+ Assert.assertEquals("postRenderViewCallbackMethod", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PostRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 4765daf..47722ec 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
@@ -100,18 +100,18 @@ public class ViewConfigTest
ViewConfigDescriptor viewConfigDescriptor = viewConfigResolver.getViewConfigDescriptor(SimplePageConfig.class);
Assert.assertNotNull(viewConfigDescriptor);
- Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, InitView.class));
- Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreViewAction.class));
- Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class));
- Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PostRenderView.class));
+ Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, InitView.class));
+ Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreViewAction.class));
+ Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class));
+ Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PostRenderView.class));
- 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(ViewControllerRef.class, InitView.class).getCallbackMethods().keySet().iterator().next());
+ Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, InitView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
- Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreViewAction.class).getCallbackMethods().keySet().iterator().next());
- Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreViewAction.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
+ Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreViewAction.class).getCallbackMethods().keySet().iterator().next());
+ Assert.assertEquals("callbackMethod1", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreViewAction.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());
+ Assert.assertEquals(PageBean003.class, viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class).getCallbackMethods().keySet().iterator().next());
+ Assert.assertEquals("callbackMethod2", ((List<Method>) viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class).getCallbackMethods().values().iterator().next()).iterator().next().getName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 e7b49e0..54ba8c3 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.ViewControllerBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef;
-@ViewControllerBean(PageBean004.class)
+@ViewControllerRef(PageBean004.class)
@TestSecured(SimpleTestAccessDecisionVoter.class)
public class SimplePageConfig implements ViewConfig
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 75c8c1c..ed3c9e1 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.ViewControllerBean
+ //org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef
@Override
public TestSecured beforeAddToConfig(TestSecured metaData, ViewConfigNode viewConfigNode)
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee250aae/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 0a99b66..a03e122 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.ViewControllerBean;
+import org.apache.deltaspike.jsf.api.config.view.controller.ViewControllerRef;
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(ViewControllerBean.class);
+ possibleMetaDataTypes.add(ViewControllerRef.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(ViewControllerBean.class, InitView.class));
- Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerBean.class, PreRenderView.class));
+ Assert.assertNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, InitView.class));
+ Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(ViewControllerRef.class, PreRenderView.class));
Assert.assertNotNull(viewConfigDescriptor.getCallbackDescriptor(TestSecured.class));
}