You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/02/19 16:25:01 UTC
svn commit: r1072358 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/
examples/jsf-playground/hello_myface...
Author: struberg
Date: Sat Feb 19 15:24:59 2011
New Revision: 1072358
URL: http://svn.apache.org/viewvc?rev=1072358&view=rev
Log:
EXTCDI-140 explicitely annotate @Dependent scoped beans and remove final
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBeanWithQualifier.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/MixedConversationDemoBean.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/ClientAwareMessageResolverProducer.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/FacesInformationProducer.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java
myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/webapp/conversation/bean/ConversationBeanWithQualifier.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java Sat Feb 19 15:24:59 2011
@@ -21,6 +21,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.logging.LoggerDetails;
import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
@@ -28,7 +29,8 @@ import javax.enterprise.inject.spi.Injec
* @author Gerhard Petracek
* @author Werner Punz
*/
-final class InstanceProducer
+@Dependent
+public class InstanceProducer
{
private java.util.logging.Logger logger = java.util.logging.Logger.getLogger(InstanceProducer.class.getName());
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java Sat Feb 19 15:24:59 2011
@@ -26,7 +26,6 @@ import org.apache.myfaces.extensions.cdi
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Typed;
import java.io.Serializable;
/**
@@ -53,7 +52,7 @@ import java.io.Serializable;
*
* TODO move jsf specific parts
*/
-@Typed()
+@Dependent
public class ProjectStageProducer implements Serializable
{
private static final long serialVersionUID = -2987762608635612074L;
Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBeanWithQualifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBeanWithQualifier.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBeanWithQualifier.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBeanWithQualifier.java Sat Feb 19 15:24:59 2011
@@ -23,12 +23,14 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.examples.codi.jsf12.conversation.grouped.qualifier.Qualifier1;
import org.apache.myfaces.examples.codi.jsf12.conversation.grouped.qualifier.Qualifier3;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
import java.io.Serializable;
/**
* @author Gerhard Petracek
*/
+@Dependent
public class ConversationDemoBeanWithQualifier implements Serializable
{
private String value = "";
Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/MixedConversationDemoBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/MixedConversationDemoBean.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/MixedConversationDemoBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/MixedConversationDemoBean.java Sat Feb 19 15:24:59 2011
@@ -26,6 +26,7 @@ import org.apache.myfaces.examples.codi.
import org.apache.myfaces.examples.codi.jsf12.conversation.grouped.qualifier.Qualifier2;
import org.apache.myfaces.examples.codi.jsf12.conversation.grouped.qualifier.Qualifier3;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
import java.io.Serializable;
import java.util.Date;
@@ -33,6 +34,7 @@ import java.util.Date;
/**
* @author Gerhard Petracek
*/
+@Dependent
public class MixedConversationDemoBean implements Serializable
{
private static final long serialVersionUID = -4238520498463300564L;
Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/ClientAwareMessageResolverProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/ClientAwareMessageResolverProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/ClientAwareMessageResolverProducer.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/ClientAwareMessageResolverProducer.java Sat Feb 19 15:24:59 2011
@@ -25,6 +25,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.message.api.MessageResolver;
import org.apache.myfaces.extensions.cdi.message.api.payload.MessagePayload;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext;
@@ -34,6 +35,7 @@ import java.util.MissingResourceExceptio
/**
* @author Gerhard Petracek
*/
+@Dependent
public class ClientAwareMessageResolverProducer
{
@Produces
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/CdiAwareBeanValidationProducer.java Sat Feb 19 15:24:59 2011
@@ -34,6 +34,7 @@ import javax.inject.Named;
/**
* @author Gerhard Petracek
*/
+@Dependent
public class CdiAwareBeanValidationProducer
{
protected CdiAwareBeanValidationProducer()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java Sat Feb 19 15:24:59 2011
@@ -34,6 +34,7 @@ import javax.inject.Named;
/**
* @author Gerhard Petracek
*/
+@Dependent
public class JsfAwareMessageContextProducer
{
@Produces
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java Sat Feb 19 15:24:59 2011
@@ -36,6 +36,7 @@ import java.util.Map;
/**
* @author Gerhard Petracek
*/
+@Dependent
final class InstanceProducer
{
@Produces
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/FacesInformationProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/FacesInformationProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/FacesInformationProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/FacesInformationProducer.java Sat Feb 19 15:24:59 2011
@@ -25,7 +25,6 @@ import javax.faces.context.FacesContext;
/**
* @author Gerhard Petracek
*/
-
@RequestScoped
public class FacesInformationProducer
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java Sat Feb 19 15:24:59 2011
@@ -37,6 +37,7 @@ import java.util.Map;
/**
* @author Gerhard Petracek
*/
+@Dependent
public class ScriptEngineManagerProducer
{
protected ScriptEngineManagerProducer()
Modified: myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/webapp/conversation/bean/ConversationBeanWithQualifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/webapp/conversation/bean/ConversationBeanWithQualifier.java?rev=1072358&r1=1072357&r2=1072358&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/webapp/conversation/bean/ConversationBeanWithQualifier.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/src/test/java/org/apache/myfaces/extensions/cdi/test/webapp/conversation/bean/ConversationBeanWithQualifier.java Sat Feb 19 15:24:59 2011
@@ -25,12 +25,15 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.test.webapp.conversation.qualifier.ConversationQualifier4;
import org.apache.myfaces.extensions.cdi.test.webapp.conversation.qualifier.ConversationQualifier5;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Produces;
import java.io.Serializable;
+
/**
* @author Jakob Korherr
*/
+@Dependent
public class ConversationBeanWithQualifier implements Serializable
{