You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/08/03 15:40:12 UTC
svn commit: r1368948 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
annotation/ context/ context/creational/ corespi/scanner/ decorator/ util/
Author: struberg
Date: Fri Aug 3 13:40:12 2012
New Revision: 1368948
URL: http://svn.apache.org/viewvc?rev=1368948&view=rev
Log:
OWB-691 add serial id field to Serializable classes
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java Fri Aug 3 13:40:12 2012
@@ -24,6 +24,7 @@ import javax.enterprise.util.AnnotationL
public class AnyLiteral extends AnnotationLiteral<Any> implements Any
{
private static final String TOSTRING = "@javax.enterprise.inject.Any()";
+ private static final long serialVersionUID = -8922048102786275371L;
@Override
public int hashCode()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java Fri Aug 3 13:40:12 2012
@@ -30,4 +30,5 @@ import javax.enterprise.util.AnnotationL
public class ApplicationScopeLiteral extends AnnotationLiteral<ApplicationScoped> implements ApplicationScoped
{
+ private static final long serialVersionUID = 8089948111744513390L;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java Fri Aug 3 13:40:12 2012
@@ -29,6 +29,7 @@ import javax.enterprise.util.AnnotationL
public class DefaultLiteral extends AnnotationLiteral<Default> implements Default
{
private static final String TOSTRING = "@javax.enterprise.inject.Default()";
+ private static final long serialVersionUID = 6788272256977634238L;
@Override
public int hashCode()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java Fri Aug 3 13:40:12 2012
@@ -30,4 +30,5 @@ import javax.enterprise.util.AnnotationL
public class DependentScopeLiteral extends AnnotationLiteral<Dependent> implements Dependent
{
+ private static final long serialVersionUID = -2677299920840834714L;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java Fri Aug 3 13:40:12 2012
@@ -29,6 +29,8 @@ import javax.inject.Named;
*/
public class NamedLiteral extends AnnotationLiteral<Named> implements Named
{
+
+ private static final long serialVersionUID = 8867272511520063730L;
private String value;
public NamedLiteral()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java Fri Aug 3 13:40:12 2012
@@ -29,6 +29,7 @@ import javax.enterprise.util.AnnotationL
*/
public class NewLiteral extends AnnotationLiteral<New> implements New
{
+ private static final long serialVersionUID = -2981014729208063412L;
private Class<?> clazz = null;
public NewLiteral()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java Fri Aug 3 13:40:12 2012
@@ -30,4 +30,5 @@ import javax.enterprise.util.AnnotationL
public class RequestedScopeLiteral extends AnnotationLiteral<RequestScoped> implements RequestScoped
{
+ private static final long serialVersionUID = -7333612898060695008L;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java Fri Aug 3 13:40:12 2012
@@ -30,4 +30,5 @@ import javax.enterprise.util.AnnotationL
public class SessionScopeLiteral extends AnnotationLiteral<SessionScoped> implements SessionScoped
{
+ private static final long serialVersionUID = -7469945140661485990L;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Fri Aug 3 13:40:12 2012
@@ -47,6 +47,7 @@ import org.apache.webbeans.context.creat
*/
public abstract class AbstractContext implements WebBeansContext, Serializable
{
+ private static final long serialVersionUID = 2357678967444477818L;
/**Context status, active or not*/
protected volatile boolean active;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java Fri Aug 3 13:40:12 2012
@@ -31,6 +31,8 @@ import org.apache.webbeans.context.creat
*/
public class ApplicationContext extends AbstractContext
{
+ private static final long serialVersionUID = -8254441824647652312L;
+
public ApplicationContext()
{
super(ApplicationScoped.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java Fri Aug 3 13:40:12 2012
@@ -40,9 +40,11 @@ import org.apache.webbeans.util.WebBeans
*/
public class ConversationContext extends AbstractContext implements Externalizable
{
+ private static final long serialVersionUID = -576054696008715282L;
+
/*
- * Constructor
- */
+ * Constructor
+ */
public ConversationContext()
{
super(ConversationScoped.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java Fri Aug 3 13:40:12 2012
@@ -39,6 +39,8 @@ import javax.enterprise.context.spi.Crea
*/
public class DependentContext extends AbstractContext
{
+ private static final long serialVersionUID = 8225241216057316441L;
+
/**
* Creats a new instance of dependent context.
*/
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java Fri Aug 3 13:40:12 2012
@@ -33,9 +33,11 @@ import org.apache.webbeans.context.creat
*/
public class RequestContext extends AbstractContext
{
+ private static final long serialVersionUID = -1030240915163272268L;
+
/*
- * Constructor
- */
+ * Constructor
+ */
public RequestContext()
{
super(RequestScoped.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java Fri Aug 3 13:40:12 2012
@@ -31,6 +31,8 @@ import org.apache.webbeans.context.creat
*/
public class SingletonContext extends AbstractContext
{
+ private static final long serialVersionUID = -7600942820719243149L;
+
public SingletonContext()
{
super(Singleton.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java Fri Aug 3 13:40:12 2012
@@ -26,6 +26,7 @@ import java.util.concurrent.locks.Reentr
public class BeanInstanceBag<T> implements Serializable
{
+ private static final long serialVersionUID = 1656996021599122499L;
private final CreationalContext<T> beanCreationalContext;
private T beanInstance;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java Fri Aug 3 13:40:12 2012
@@ -74,6 +74,7 @@ public class AnnotationDB
public class CrossReferenceException extends Exception
{
+ private static final long serialVersionUID = 8012802335134828909L;
private Set<String> unresolved;
public CrossReferenceException(Set<String> unresolved)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java Fri Aug 3 13:40:12 2012
@@ -45,6 +45,7 @@ import javassist.util.proxy.MethodHandle
public class DelegateHandler implements MethodHandler, Serializable, Externalizable
{
private static final Logger logger = WebBeansLoggerFacade.getLogger(DelegateHandler.class);
+ private static final long serialVersionUID = -3063755008944970684L;
private transient List<Object> decorators;
private transient ThreadLocal<AtomicInteger> position = new ThreadLocal<AtomicInteger>()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1368948&r1=1368947&r2=1368948&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Fri Aug 3 13:40:12 2012
@@ -178,9 +178,23 @@ public final class WebBeansUtil
*/
private static volatile Boolean enforceCheckedException;
- private final static Class<Instance<?>> INSTANCE_TYPE = new TypeLiteral<Instance<?>>(){}.getRawType();
- private final static Class<Provider<?>> PROVIDER_TYPE = new TypeLiteral<Provider<?>>(){}.getRawType();
- private final static Class<Event<?>> EVENT_TYPE = new TypeLiteral<Event<?>>(){}.getRawType();
+ private final static Class<Instance<?>> INSTANCE_TYPE
+ = new TypeLiteral<Instance<?>>()
+ {
+ private static final long serialVersionUID = 3555319035805031154L;
+ }.getRawType();
+
+ private final static Class<Provider<?>> PROVIDER_TYPE
+ = new TypeLiteral<Provider<?>>()
+ {
+ private static final long serialVersionUID = -2611190564495920054L;
+ }.getRawType();
+
+ private final static Class<Event<?>> EVENT_TYPE
+ = new TypeLiteral<Event<?>>()
+ {
+ private static final long serialVersionUID = -1395145871249763477L;
+ }.getRawType();
private final WebBeansContext webBeansContext;