You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/10/01 22:00:50 UTC
svn commit: r820769 - in
/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax: decorator/
enterprise/context/ enterprise/inject/ enterprise/inject/deployment/
enterprise/inject/stereotype/
Author: gerdogdu
Date: Thu Oct 1 20:00:49 2009
New Revision: 820769
URL: http://svn.apache.org/viewvc?rev=820769&view=rev
Log:
Update APIs.
Added:
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Specializes.java
- copied, changed from r820750, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java
Removed:
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java
Modified:
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java (contents, props changed)
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java (contents, props changed)
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java
incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorates.java Thu Oct 1 20:00:49 2009
@@ -19,6 +19,7 @@
package javax.decorator;
import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -31,7 +32,7 @@
* @version $Rev$ $Date$
*
*/
-@Target(FIELD)
+@Target({FIELD,PARAMETER})
@Retention(RUNTIME)
@Documented
public @interface Decorates
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/decorator/Decorator.java Thu Oct 1 20:00:49 2009
@@ -20,7 +20,6 @@
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -37,7 +36,6 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Documented
@Stereotype
-@Inherited
public @interface Decorator
{
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ApplicationScoped.java Thu Oct 1 20:00:49 2009
@@ -18,6 +18,7 @@
*/
package javax.enterprise.context;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -33,9 +34,10 @@
* </p>
*/
@NormalScope
-@Target( { ElementType.TYPE, ElementType.METHOD })
+@Target( { ElementType.TYPE, ElementType.METHOD , ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
+@Documented
public @interface ApplicationScoped
{
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/ConversationScoped.java Thu Oct 1 20:00:49 2009
@@ -18,6 +18,7 @@
*/
package javax.enterprise.context;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -30,9 +31,10 @@
* @see Conversation
*/
@NormalScope(passivating=true)
-@Target( { ElementType.TYPE, ElementType.METHOD })
+@Target( { ElementType.TYPE, ElementType.METHOD , ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
+@Documented
public @interface ConversationScoped
{
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/Dependent.java Thu Oct 1 20:00:49 2009
@@ -18,6 +18,7 @@
*/
package javax.enterprise.context;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
@@ -48,6 +49,7 @@
@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
@Inherited
+@Documented
public @interface Dependent
{
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java Thu Oct 1 20:00:49 2009
@@ -32,9 +32,11 @@
* Defines the request scope.
*
* <p>
- * Please see <b>8.5.1 Request context lifecycle</b> of the specification
- * for getting furher information
+ * Please see <b>Request context lifecycle</b> of the specification
+ * for getting furher information.
* </p>
+ *
+ * @version $Rev$Â $Date$
*/
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/RequestScoped.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java Thu Oct 1 20:00:49 2009
@@ -28,6 +28,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+/**
+ * Session scoped.
+ * @version $Rev$ $Date$
+ *
+ */
@Target( { TYPE, METHOD, FIELD})
@Retention(RUNTIME)
@Documented
Propchange: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/context/SessionScoped.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Instance.java Thu Oct 1 20:00:49 2009
@@ -20,6 +20,8 @@
import java.lang.annotation.Annotation;
+import javax.inject.Provider;
+
/**
* The <code>Instance</code> interface provides a method for obtaining
* instances of beans with required types and qualifiers.
@@ -28,17 +30,8 @@
*
* @param <T> bean required type
*/
-public interface Instance<T> extends Iterable<T>
-{
- /**
- * Returns bean instance with required type
- * and required qualifier that are defined
- * at the injection point.
- *
- * @return bean instance with required type and required qualifier
- */
- public T get();
-
+public interface Instance<T> extends Iterable<T>, Provider<T>
+{
/**
* Creates new <code>Instance</code> with given
* qualifiers.
Copied: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Specializes.java (from r820750, incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Specializes.java?p2=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Specializes.java&p1=incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java&r1=820750&r2=820769&rev=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/Specializes.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/Specializes.java Thu Oct 1 20:00:49 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package javax.enterprise.inject.deployment;
+package javax.enterprise.inject;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.METHOD;
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/deployment/DeploymentType.java Thu Oct 1 20:00:49 2009
@@ -28,6 +28,7 @@
@Target(ANNOTATION_TYPE)
@Retention(RUNTIME)
@Documented
+@Deprecated
public @interface DeploymentType
{
Modified: incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java?rev=820769&r1=820768&r2=820769&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java (original)
+++ incubator/openwebbeans/trunk/webbeans-api/src/main/java/javax/enterprise/inject/stereotype/Model.java Thu Oct 1 20:00:49 2009
@@ -24,7 +24,6 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -39,7 +38,6 @@
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
-@Inherited
public @interface Model
{