You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/12 21:41:55 UTC
svn commit: r963448 - in
/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped:
./ qualifier/
Author: gpetracek
Date: Mon Jul 12 19:41:55 2010
New Revision: 963448
URL: http://svn.apache.org/viewvc?rev=963448&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 additional examples
Added:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/qualifier/Qualifier3.java
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean3.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean4.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBeanWithQualifier.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/MixedConversationDemoBean.java
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean3.java?rev=963448&r1=963447&r2=963448&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean3.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean3.java Mon Jul 12 19:41:55 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.blank.conversation.grouped;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import javax.inject.Named;
@@ -31,8 +29,7 @@ import java.util.Date;
* @author Gerhard Petracek
*/
@Named
-@ConversationScoped
-@ConversationGroup(WindowScoped.class)
+@WindowScoped
public class ConversationDemoBean3 implements Serializable
{
private String value = "Hello window conversation! ";
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean4.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean4.java?rev=963448&r1=963447&r2=963448&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean4.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBean4.java Mon Jul 12 19:41:55 2010
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.blank.conversation.grouped;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier1;
import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier2;
+import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier3;
import javax.inject.Named;
import javax.inject.Inject;
@@ -34,8 +34,7 @@ import java.util.Date;
* @author Gerhard Petracek
*/
@Named
-@ConversationScoped
-@ConversationGroup(ViewAccessScoped.class)
+@ViewAccessScoped
public class ConversationDemoBean4 implements Serializable
{
private String value = "Hello view access scoped! ";
@@ -44,13 +43,20 @@ public class ConversationDemoBean4 imple
@Inject
@Qualifier1
+ @ConversationGroup(ConversationGroup1.class)
private ConversationDemoBeanWithQualifier bean1;
@Inject
- @Qualifier2
+ @Qualifier3
+ @ConversationGroup(ConversationGroup1.class)
private ConversationDemoBeanWithQualifier bean2;
@Inject
+ @Qualifier3
+ @ConversationGroup(ConversationGroup1.class)
+ private MixedConversationDemoBean bean3;
+
+ @Inject
@Qualifier1
private MixedConversationDemoBean mixedBean1;
@@ -73,6 +79,7 @@ public class ConversationDemoBean4 imple
" injected beans: " +
this.bean1.getValue() + " " +
this.bean2.getValue() + " " +
+ this.bean3.getValue() + " " +
this.mixedBean1.getValue() + " " +
this.mixedBean2.getValue();
}
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBeanWithQualifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBeanWithQualifier.java?rev=963448&r1=963447&r2=963448&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBeanWithQualifier.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/ConversationDemoBeanWithQualifier.java Mon Jul 12 19:41:55 2010
@@ -19,8 +19,9 @@
package org.apache.myfaces.blank.conversation.grouped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier1;
-import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier2;
+import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier3;
import javax.enterprise.inject.Produces;
import java.io.Serializable;
@@ -45,14 +46,16 @@ public class ConversationDemoBeanWithQua
@Produces
@Qualifier1
@ConversationScoped
+ @ConversationGroup(ConversationGroup1.class)
public ConversationDemoBeanWithQualifier createConversationDemoBean1WithQ1()
{
return new ConversationDemoBeanWithQualifier("Q1");
}
@Produces
- @Qualifier2
+ @Qualifier3
@ConversationScoped
+ @ConversationGroup(ConversationGroup1.class)
public ConversationDemoBeanWithQualifier createConversationDemoBean1WithQ2()
{
return new ConversationDemoBeanWithQualifier("Q2");
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/MixedConversationDemoBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/MixedConversationDemoBean.java?rev=963448&r1=963447&r2=963448&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/MixedConversationDemoBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/MixedConversationDemoBean.java Mon Jul 12 19:41:55 2010
@@ -20,8 +20,11 @@ package org.apache.myfaces.blank.convers
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier1;
import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier2;
+import org.apache.myfaces.blank.conversation.grouped.qualifier.Qualifier3;
import javax.enterprise.inject.Produces;
import java.io.Serializable;
@@ -64,6 +67,15 @@ public class MixedConversationDemoBean i
return new MixedConversationDemoBean("Q2@ViewAccessScoped ");
}
+ @Produces
+ @Qualifier3
+ @ConversationScoped
+ @ConversationGroup(ConversationGroup1.class)
+ public MixedConversationDemoBean createGroupedConversationScopedBean()
+ {
+ return new MixedConversationDemoBean("Q2@ConversationScoped/@ConversationGroup ");
+ }
+
public String getValue()
{
return value + createdAt.toLocaleString();
Added: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/qualifier/Qualifier3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/qualifier/Qualifier3.java?rev=963448&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/qualifier/Qualifier3.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/conversation/grouped/qualifier/Qualifier3.java Mon Jul 12 19:41:55 2010
@@ -0,0 +1,41 @@
+/*
+ * 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.myfaces.blank.conversation.grouped.qualifier;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Target({PARAMETER, FIELD, METHOD, CONSTRUCTOR})
+@Retention(RUNTIME)
+@Documented
+
+@Qualifier
+public @interface Qualifier3
+{
+}
\ No newline at end of file