[weld-commits] Weld SVN: r6977 - in cdi-tck/branches/1.0: impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver and 3 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-08-10 19:13:27 -0400 (Tue, 10 Aug 2010)
New Revision: 6977

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
   cdi-tck/branches/1.0/pom.xml
Log:
upgrade to CDI API 1.0-SP2

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java	2010-08-10 23:03:55 UTC (rev 6976)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java	2010-08-10 23:13:27 UTC (rev 6977)
@@ -21,7 +21,7 @@
 
 class AlarmSystem
 {
-   public void onBreakInAttempt(@Observes(notifyObserver = Reception.IF_EXISTS) BreakIn breakIn)
+   public void onBreakInAttempt(@Observes(receive = Reception.IF_EXISTS) BreakIn breakIn)
    {
       assert false;
    }

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java	2010-08-10 23:03:55 UTC (rev 6976)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java	2010-08-10 23:13:27 UTC (rev 6977)
@@ -30,7 +30,7 @@
       wasNotified = true;
    }
    
-   void conditionalObserve(@Observes(notifyObserver = Reception.IF_EXISTS) ConditionalEvent e)
+   void conditionalObserve(@Observes(receive = Reception.IF_EXISTS) ConditionalEvent e)
    {
    }
 }

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java	2010-08-10 23:03:55 UTC (rev 6976)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java	2010-08-10 23:13:27 UTC (rev 6977)
@@ -31,7 +31,7 @@
    private boolean instanceNotified = false;
    private Web web;
    
-   public void observe(@Observes(notifyObserver = Reception.IF_EXISTS) ConditionalEvent someEvent)
+   public void observe(@Observes(receive = Reception.IF_EXISTS) ConditionalEvent someEvent)
    {
       notified = true;
       instanceNotified = true;

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java	2010-08-10 23:03:55 UTC (rev 6976)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java	2010-08-10 23:13:27 UTC (rev 6977)
@@ -146,7 +146,7 @@
                   return TransactionPhase.IN_PROGRESS;
                }
 
-               public Reception notifyObserver()
+               public Reception receive()
                {
                   return Reception.ALWAYS;
                }

Modified: cdi-tck/branches/1.0/pom.xml
===================================================================
--- cdi-tck/branches/1.0/pom.xml	2010-08-10 23:03:55 UTC (rev 6976)
+++ cdi-tck/branches/1.0/pom.xml	2010-08-10 23:13:27 UTC (rev 6977)
@@ -78,7 +78,7 @@
       <jboss.test.harness.version>1.1.0-CR5</jboss.test.harness.version>
       <testng.version>5.10</testng.version>
       <jsr250.api.version>1.0</jsr250.api.version>
-      <cdi.api.version>1.0-SP1</cdi.api.version>
+      <cdi.api.version>1.0-SP2</cdi.api.version>
       <atinject.api.version>1</atinject.api.version>
       <ejb.api.version>3.1.0</ejb.api.version>
       <jsr250.api.version>1.0</jsr250.api.version>