svn commit: r1493277 - in /geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject: Instance.java spi/Interceptor.java spi/ProcessProducerField.java spi/ProcessProducerMethod.java

[st...@apache.org]

Author: struberg
Date: Fri Jun 14 23:05:23 2013
New Revision: 1493277

URL: http://svn.apache.org/r1493277
Log:
GERONIMO-6182 finish CDI-1.1 upgrade

Modified:
    geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/Instance.java
    geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java
    geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
    geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java

Modified: geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/Instance.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/Instance.java?rev=1493277&r1=1493276&r2=1493277&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/Instance.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/Instance.java Fri Jun 14 23:05:23 2013
@@ -76,5 +76,12 @@ public interface Instance<T> extends Ite
      */
     public boolean isAmbiguous();
 
+    /**
+     * Destroy the given Contextual Instance.
+     * This is especially intended for {@link javax.enterprise.context.Dependent} scoped beans
+     * which might otherwise create mem leaks.
+     * @param instance
+     */
+    public void destroy(T instance);
 
-}
\ No newline at end of file
+}

Modified: geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java?rev=1493277&r1=1493276&r2=1493277&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java Fri Jun 14 23:05:23 2013
@@ -56,7 +56,8 @@ public interface Interceptor<T> extends 
      * @param ctx the InvocationContext contains all the interceptor chain state for a single invocation.
      * @return the object or wrapper type returned by the intercepted instance or the previous interceptor
      *         (if this is not the last interceptor in the chain)
+     * @throws Exception wrapped from the intercepted instance. See CDI-115
      */
-    public Object intercept(InterceptionType type, T instance, InvocationContext ctx);
+    public Object intercept(InterceptionType type, T instance, InvocationContext ctx) throws Exception;
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java?rev=1493277&r1=1493276&r2=1493277&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java Fri Jun 14 23:05:23 2013
@@ -33,5 +33,11 @@ public interface ProcessProducerField<X,
      * 
      * @return annotated field.
      */
-    public AnnotatedField<X> getAnnotatedProducerField();    
+    public AnnotatedField<X> getAnnotatedProducerField();
+
+    /**
+     * @return the {@link javax.enterprise.inject.Disposes} annotated parameter of the disposal method
+     *      which fits the producer field, or <code>null</code> if there is no disposal method.
+     */
+    public AnnotatedParameter<X> getAnnotatedDisposedParameter();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java?rev=1493277&r1=1493276&r2=1493277&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.1_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java Fri Jun 14 23:05:23 2013
@@ -37,8 +37,9 @@ public interface ProcessProducerMethod<X
 
     /**
      * Returns annotated parameter.
-     * 
-     * @return annotated parameter.
+     * @return the {@link javax.enterprise.inject.Disposes} annotated parameter of the disposal method
+     *      which fits the producer field, or <code>null</code> if there is no disposal method.
      */
     public AnnotatedParameter<X> getAnnotatedDisposedParameter();
+
 }