You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/02/03 04:02:01 UTC
svn commit: r905874 - in /geronimo/specs/trunk/geronimo-jcdi_1.0_spec: ./
src/main/java/javax/enterprise/context/
src/main/java/javax/enterprise/inject/
src/main/java/javax/enterprise/inject/spi/
src/main/java/javax/enterprise/util/
Author: dwoods
Date: Wed Feb 3 03:01:05 2010
New Revision: 905874
URL: http://svn.apache.org/viewvc?rev=905874&view=rev
Log:
GERONIMO-5101 Updates for signature tests. Patch contributed by Gurkan Erdogdu.
Modified:
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java
geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml Wed Feb 3 03:01:05 2010
@@ -69,6 +69,12 @@
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java Wed Feb 3 03:01:05 2010
@@ -41,6 +41,11 @@
private static final long serialVersionUID = 4783816486073845333L;
+ public BusyConversationException()
+ {
+
+ }
+
/**
* Creates a new exception with message.
*
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java Wed Feb 3 03:01:05 2010
@@ -34,6 +34,11 @@
private static final long serialVersionUID = 4783816486073845333L;
+ public ContextNotActiveException()
+ {
+
+ }
+
/**
* Creates a new exception with message.
*
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java Wed Feb 3 03:01:05 2010
@@ -30,11 +30,11 @@
*
* @see Conversation
*/
-@NormalScope(passivating=true)
-@Target( { ElementType.TYPE, ElementType.METHOD , ElementType.FIELD})
+@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
-@Inherited
@Documented
+@NormalScope(passivating = true)
+@Inherited
public @interface ConversationScoped
{
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java Wed Feb 3 03:01:05 2010
@@ -46,7 +46,7 @@
*
*/
@Scope
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
+@Target( { ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java Wed Feb 3 03:01:05 2010
@@ -38,6 +38,11 @@
private static final long serialVersionUID = 4783816486073845333L;
+ public NonexistentConversationException()
+ {
+
+ }
+
/**
* Creates a new exception with message.
*
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java Wed Feb 3 03:01:05 2010
@@ -35,7 +35,7 @@
*
* @version $Rev$ $Date$
*/
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
@Retention(RUNTIME)
@Documented
@Qualifier
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java Wed Feb 3 03:01:05 2010
@@ -18,6 +18,7 @@
*/
package javax.enterprise.inject;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -25,6 +26,7 @@
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.RUNTIME)
+@Documented
public @interface Disposes
{
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java Wed Feb 3 03:01:05 2010
@@ -19,6 +19,7 @@
package javax.enterprise.inject;
import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -29,7 +30,7 @@
import javax.inject.Qualifier;
-@Target( { METHOD, FIELD, PARAMETER })
+@Target( { FIELD, PARAMETER, METHOD, TYPE})
@Retention(RUNTIME)
@Documented
@Qualifier
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java Wed Feb 3 03:01:05 2010
@@ -30,7 +30,7 @@
* @version $Rev$ $Date$
*
*/
-@Target(value={ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Target(value={ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface Typed
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java Wed Feb 3 03:01:05 2010
@@ -26,7 +26,7 @@
* @param <X> bean class
* @param <T> observed event type
*/
-public interface ProcessObserverMethod<X, T>
+public interface ProcessObserverMethod<T, X>
{
/**
* Returns annotated method.
@@ -41,7 +41,7 @@
*
* @return observer method instance
*/
- public ObserverMethod<X> getObserverMethod();
+ public ObserverMethod<T> getObserverMethod();
/**
* Add throwable.
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java Wed Feb 3 03:01:05 2010
@@ -25,7 +25,7 @@
*
* @param <X> bean class
*/
-public interface ProcessSessionBean<X> extends ProcessManagedBean<X>
+public interface ProcessSessionBean<X> extends ProcessManagedBean<Object>
{
/**
* Returns ejb name.
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java Wed Feb 3 03:01:05 2010
@@ -18,6 +18,7 @@
*/
package javax.enterprise.util;
+import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
@@ -30,8 +31,9 @@
* @version $Rev$Â $Date$
*/
@SuppressWarnings("unchecked")
-public abstract class AnnotationLiteral<T extends Annotation> implements Annotation
+public abstract class AnnotationLiteral<T extends Annotation> implements Annotation, Serializable
{
+ private static final long serialVersionUID = -1885320698638161810L;
private Class<T> annotationType;
@@ -43,13 +45,12 @@
}
- @Override
public Class<? extends Annotation> annotationType()
{
return annotationType;
}
- protected Class<T> getAnnotationType(Class<?> definedClazz)
+ private Class<T> getAnnotationType(Class<?> definedClazz)
{
Type superClazz = definedClazz.getGenericSuperclass();
@@ -127,7 +128,7 @@
return false;
}
- protected Object callMethod(Object instance, Method method)
+ private Object callMethod(Object instance, Method method)
{
boolean access = method.isAccessible();
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java Wed Feb 3 03:01:05 2010
@@ -21,7 +21,6 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -46,7 +45,6 @@
*/
@Retention(RUNTIME)
@Target(METHOD)
-@Documented
public @interface Nonbinding
{
}
Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java?rev=905874&r1=905873&r2=905874&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java Wed Feb 3 03:01:05 2010
@@ -18,6 +18,7 @@
*/
package javax.enterprise.util;
+import java.io.Serializable;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -29,8 +30,10 @@
* @param <T> wrapped type
*/
@SuppressWarnings("unchecked")
-public abstract class TypeLiteral<T>
+public abstract class TypeLiteral<T> implements Serializable
{
+ private static final long serialVersionUID = 6993258591899719600L;
+
private Type definedType;
protected TypeLiteral()
@@ -69,7 +72,7 @@
return rawType;
}
- protected Type getDefinedType(Class<?> clazz)
+ private Type getDefinedType(Class<?> clazz)
{
Type type = null;