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/08/08 11:42:57 UTC
svn commit: r983371 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/
jee-modules/jsf-module/impl/src/main/java/or...
Author: gpetracek
Date: Sun Aug 8 09:42:56 2010
New Revision: 983371
URL: http://svn.apache.org/viewvc?rev=983371&view=rev
Log:
cleanup
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/ConfigResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/FacesMessageInterpolator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ConversationExpirationEvaluator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfAwareConversationFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutConversationExpirationEvaluator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationConfiguration.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/ConfigResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/ConfigResolver.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/ConfigResolver.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/ConfigResolver.java Sun Aug 8 09:42:56 2010
@@ -20,10 +20,12 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig;
+import java.io.Serializable;
+
/**
* @author Gerhard Petracek
*/
-public interface ConfigResolver
+public interface ConfigResolver extends Serializable
{
public <T extends CodiConfig> T resolve(Class<T> targetType);
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java Sun Aug 8 09:42:56 2010
@@ -79,6 +79,8 @@ public class ConfigProducer
{
return new ConfigResolver()
{
+ private static final long serialVersionUID = -4410313406799415118L;
+
public <T extends CodiConfig> T resolve(Class<T> targetType)
{
CodiConfig codiConfig = ApplicationCache.getConfig(targetType);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/FacesMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/FacesMessageInterpolator.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/FacesMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/FacesMessageInterpolator.java Sun Aug 8 09:42:56 2010
@@ -32,6 +32,8 @@ import java.io.Serializable;
*/
class FacesMessageInterpolator implements MessageInterpolator
{
+ private static final long serialVersionUID = -5367321374822078592L;
+
private MessageInterpolator messageInterpolator;
public FacesMessageInterpolator(ELProvider elProvider)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java Sun Aug 8 09:42:56 2010
@@ -61,12 +61,12 @@ class BeanStorage implements Serializabl
for (BeanEntry<Serializable> beanHolder : this.beanMap.values())
{
oldBeanInstance = beanHolder.resetBeanInstance();
- fireUnscopeBeanEvent(oldBeanInstance, beanHolder);
+ fireUnscopeBeanEvent(oldBeanInstance);
destroyBean(beanHolder.getCreationalContext(), beanHolder.getBean(), oldBeanInstance);
}
}
- private <T extends Serializable> void fireUnscopeBeanEvent(T instance, BeanEntry<T> beanHolder)
+ private <T extends Serializable> void fireUnscopeBeanEvent(T instance)
{
getOrCreateBeanManager().fireEvent(new UnscopeBeanEvent(instance));
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ConversationExpirationEvaluator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ConversationExpirationEvaluator.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ConversationExpirationEvaluator.java Sun Aug 8 09:42:56 2010
@@ -18,10 +18,12 @@
*/
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
+import java.io.Serializable;
+
/**
* @author Gerhard Petracek
*/
-public interface ConversationExpirationEvaluator
+public interface ConversationExpirationEvaluator extends Serializable
{
boolean isExpired();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java Sun Aug 8 09:42:56 2010
@@ -34,6 +34,8 @@ import java.util.Date;
*/
public class DefaultWindowContextQuotaHandler implements WindowContextQuotaHandler
{
+ private static final long serialVersionUID = 4354405166761604711L;
+
private final int maxWindowContextCount;
public DefaultWindowContextQuotaHandler(int maxWindowContextCount)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfAwareConversationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfAwareConversationFactory.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfAwareConversationFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfAwareConversationFactory.java Sun Aug 8 09:42:56 2010
@@ -29,6 +29,8 @@ import org.apache.myfaces.extensions.cdi
*/
public class JsfAwareConversationFactory implements ConversationFactory
{
+ private static final long serialVersionUID = 2329113439978807663L;
+
enum ConversationPropertyKeys
{
TIMEOUT("timeout");
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/JsfWindowContext.java Sun Aug 8 09:42:56 2010
@@ -187,6 +187,8 @@ public class JsfWindowContext implements
{
return new ConversationConfiguration()
{
+ private static final long serialVersionUID = 7592517957368180995L;
+
public <T> T getValue(String key, Class<T> targetType)
{
if(TIMEOUT.getKey().equals(key))
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutConversationExpirationEvaluator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutConversationExpirationEvaluator.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutConversationExpirationEvaluator.java Sun Aug 8 09:42:56 2010
@@ -24,6 +24,8 @@ package org.apache.myfaces.extensions.cd
class TimeoutConversationExpirationEvaluator extends TimeoutExpirationEvaluator
implements ConversationExpirationEvaluator
{
+ private static final long serialVersionUID = 6035785888847376129L;
+
TimeoutConversationExpirationEvaluator(int conversationTimeoutInMinutes)
{
super(conversationTimeoutInMinutes);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java Sun Aug 8 09:42:56 2010
@@ -19,12 +19,15 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
import java.util.Date;
+import java.io.Serializable;
/**
* @author Gerhard Petracek
*/
-public class TimeoutExpirationEvaluator
+public class TimeoutExpirationEvaluator implements Serializable
{
+ private static final long serialVersionUID = -1132091879142732148L;
+
private final long timeoutInMs;
protected Date lastAccess;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluator.java Sun Aug 8 09:42:56 2010
@@ -29,6 +29,7 @@ import javax.faces.context.FacesContext;
class ViewAccessConversationExpirationEvaluator implements ConversationExpirationEvaluator
{
private String lastViewId; //for access scope
+ private static final long serialVersionUID = 5586717766107967144L;
public boolean isExpired()
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java Sun Aug 8 09:42:56 2010
@@ -23,6 +23,8 @@ package org.apache.myfaces.extensions.cd
*/
class WindowConversationExpirationEvaluator implements ConversationExpirationEvaluator
{
+ private static final long serialVersionUID = 6646005969384698897L;
+
public boolean isExpired()
{
return false;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationConfiguration.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationConfiguration.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationConfiguration.java Sun Aug 8 09:42:56 2010
@@ -18,10 +18,12 @@
*/
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi;
+import java.io.Serializable;
+
/**
* @author Gerhard Petracek
*/
-public interface ConversationConfiguration
+public interface ConversationConfiguration extends Serializable
{
public <T> T getValue(String key, Class<T> targetType);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationFactory.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/ConversationFactory.java Sun Aug 8 09:42:56 2010
@@ -20,10 +20,12 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
+import java.io.Serializable;
+
/**
* @author Gerhard Petracek
*/
-public interface ConversationFactory
+public interface ConversationFactory extends Serializable
{
Conversation createConversation(ConversationKey conversationKey, ConversationConfiguration config);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java?rev=983371&r1=983370&r2=983371&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java Sun Aug 8 09:42:56 2010
@@ -18,10 +18,12 @@
*/
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi;
+import java.io.Serializable;
+
/**
* @author Gerhard Petracek
*/
-public interface WindowContextQuotaHandler
+public interface WindowContextQuotaHandler extends Serializable
{
boolean checkQuota(int activeWindowContextCount);