[webbeans-commits] Webbeans SVN: r667 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap and 4 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Dec 22 06:08:43 EST 2008


Author: pete.muir at jboss.org
Date: 2008-12-22 06:08:42 -0500 (Mon, 22 Dec 2008)
New Revision: 667

Added:
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtainable.java
Removed:
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java
Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
Log:
Change @Observable -> @Fires, @Obtainable -> @Obtains

Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,  
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a variable to be injected with an Event object that can be fired and 
- * observed by observer methods
- * 
- * @author David Allen
- * @author Gavin King
- */
-
- at BindingType
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
-public @interface Fires
-{
-}

Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java (from rev 661, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java	                        (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,  
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a variable to be injected with an Event object that can be fired and 
+ * observed by observer methods
+ * 
+ * @author David Allen
+ * @author Gavin King
+ */
+
+ at BindingType
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+public @interface Observable
+{
+}


Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtainable.java (from rev 661, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java)
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtainable.java	                        (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtainable.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,  
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a variable to be injected with an Instance object.
+ * 
+ * @author Gavin King
+ */
+
+ at BindingType
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+public @interface Obtainable
+{
+}

Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,  
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a variable to be injected with an Instance object.
- * 
- * @author Gavin King
- */
-
- at BindingType
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
-public @interface Obtains
-{
-}

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -42,10 +42,10 @@
 
 import javax.webbeans.DefinitionException;
 import javax.webbeans.Initializer;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Observer;
 import javax.webbeans.Observes;
-import javax.webbeans.Obtains;
+import javax.webbeans.Obtainable;
 
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.ManagerImpl;
@@ -200,18 +200,18 @@
       }
       for (AnnotatedMethod<Object> initializerMethod : bean.getInitializerMethods())
       {
-         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Fires.class))
+         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Observable.class))
          {
             registerEvent(parameter, beans);
          }
       }
       for (AnnotatedItem injectionPoint : bean.getInjectionPoints())
       {
-         if ( injectionPoint.isAnnotationPresent(Fires.class) )  
+         if ( injectionPoint.isAnnotationPresent(Observable.class) )  
          {
             registerEvent(injectionPoint, beans);
          }
-         if ( injectionPoint.isAnnotationPresent(Obtains.class) )  
+         if ( injectionPoint.isAnnotationPresent(Obtainable.class) )  
          {
             InstanceBean<Object, Field> instanceBean = createInstanceBean(injectionPoint, manager);
             beans.add(instanceBean);
@@ -333,7 +333,7 @@
    @SuppressWarnings("unchecked")
    private void registerEvent(AnnotatedItem injectionPoint, Set<AbstractBean<?, ?>> beans)
    {
-      if ( injectionPoint.isAnnotationPresent(Fires.class) )
+      if ( injectionPoint.isAnnotationPresent(Observable.class) )
       {
          EventBean<Object, Method> eventBean = createEventBean(injectionPoint, manager);
          beans.add(eventBean);

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Observer;
 import javax.webbeans.manager.Manager;
 
@@ -41,7 +41,7 @@
 public class EventImpl<T> extends FacadeImpl<T> implements Event<T>
 {
    @SuppressWarnings("unchecked")
-   private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Fires.class));
+   private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Observable.class));
 
    /**
     * Constructor

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -30,7 +30,7 @@
 import javax.webbeans.BeforeTransactionCompletion;
 import javax.webbeans.Disposes;
 import javax.webbeans.IfExists;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Observes;
 import javax.webbeans.manager.Manager;
 
@@ -44,7 +44,7 @@
 public interface AnnotatedMethod<T> extends AnnotatedItem<T, Method>
 {
    @SuppressWarnings("unchecked")
-   public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, Fires.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class));
+   public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, Observable.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class));
 
    /**
     * Gets the abstracted parameters of the method

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -2,7 +2,7 @@
 
 import javax.webbeans.Event;
 import javax.webbeans.Initializer;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
 
@@ -12,7 +12,7 @@
    private Mess someMess;
 
    @Initializer
-   public AuroraFinch(@Fires Event<Mess> eventObject)
+   public AuroraFinch(@Observable Event<Mess> eventObject)
    {
       // Create a new mess and fire the event for it
       someMess = new Mess();

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,12 +1,12 @@
 package org.jboss.webbeans.test.beans;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Observer;
 
 public class BlueFacedParrotFinch
 {
-   @Fires
+   @Observable
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -5,7 +5,7 @@
 import javax.webbeans.ConversationScoped;
 import javax.webbeans.Destructor;
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
 
@@ -20,7 +20,7 @@
    }
 
    @Destructor @Remove
-   public void remove(@Fires Event<Mess> eventObject)
+   public void remove(@Observable Event<Mess> eventObject)
    {
       // Create a new mess and fire the event for it
       someMess = new Mess();

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -2,7 +2,7 @@
 
 import javax.webbeans.Event;
 import javax.webbeans.Initializer;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.RequestScoped;
 
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
@@ -18,7 +18,7 @@
    }
 
    @Initializer
-   public void theInitializerMethod(@Fires Event<Mess> eventObject)
+   public void theInitializerMethod(@Observable Event<Mess> eventObject)
    {
       // Create a new mess and fire the event for it
       someMess = new Mess();

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -2,7 +2,7 @@
 
 import javax.webbeans.Event;
 import javax.webbeans.Named;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Produces;
 import javax.webbeans.RequestScoped;
 
@@ -19,7 +19,7 @@
    }
 
    @Produces
-   public Mess producerOfMesses(@Fires Event<Mess> messEvent)
+   public Mess producerOfMesses(@Observable Event<Mess> messEvent)
    {
       Mess newMess = new Mess();
       messEvent.fire(newMess);

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,11 +1,11 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 
 public class BlackRumpedWaxbill
 {
-   @Fires
+   @Observable
    private Event simpleEvent;
 
    public void eliminateWarning()

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -2,11 +2,11 @@
 
 import java.util.ArrayList;
 
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 
 public class CommonWaxbill
 {
-   @Fires
+   @Observable
    private ArrayList<String> simpleEvent;
 
    public void eliminateWarning()

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,11 +1,11 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 
 public class GoldbreastWaxbill
 {
-   @Fires
+   @Observable
    private Event<?> simpleEvent;
 
    public void eliminateWarning()

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 
 public class JavaSparrow
 {
-   @Fires
+   @Observable
    private Event<ArrayList<String>> simpleEvent;
 
    public void eliminateWarning()

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,14 +1,14 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Observer;
 
 import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
 
 public class OwlFinch
 {
-   @Fires
+   @Observable
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java	2008-12-22 11:08:42 UTC (rev 667)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Fires;
+import javax.webbeans.Observable;
 import javax.webbeans.Observer;
 
 import org.jboss.webbeans.test.annotations.Role;
@@ -9,7 +9,7 @@
 
 public class SweeWaxbill
 {
-   @Fires @Role("Admin")
+   @Observable @Role("Admin")
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()




More information about the weld-commits mailing list