geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r899269 - in /geronimo/specs/trunk: geronimo-annotation_1.1_spec/src/main/java/javax/annotation/ geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ geronimo-jcdi_1.0_spec/src/main/java/javax/interceptor/
Date Thu, 14 Jan 2010 16:19:08 GMT
Author: dblevins
Date: Thu Jan 14 16:19:07 2010
New Revision: 899269

URL: http://svn.apache.org/viewvc?rev=899269&view=rev
Log:
Fixed Incompatibilities based on the 24-Nov-2009 Java EE 6 TCK
Still in progress

Modified:
    geronimo/specs/trunk/geronimo-annotation_1.1_spec/src/main/java/javax/annotation/Resource.java
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/interceptor/Interceptor.java

Modified: geronimo/specs/trunk/geronimo-annotation_1.1_spec/src/main/java/javax/annotation/Resource.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.1_spec/src/main/java/javax/annotation/Resource.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.1_spec/src/main/java/javax/annotation/Resource.java
(original)
+++ geronimo/specs/trunk/geronimo-annotation_1.1_spec/src/main/java/javax/annotation/Resource.java
Thu Jan 14 16:19:07 2010
@@ -53,4 +53,6 @@
     String mappedName() default "";
 
     String description() default "";
+
+    String lookup() default "";
 }

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java
(original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java
Thu Jan 14 16:19:07 2010
@@ -24,9 +24,8 @@
 import static javax.ejb.ConcurrencyManagementType.CONTAINER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
 
-@java.lang.annotation.Target(value = {METHOD, TYPE})
+@java.lang.annotation.Target(value = {TYPE})
 @java.lang.annotation.Retention(value = RUNTIME)
 public @interface ConcurrencyManagement {
     javax.ejb.ConcurrencyManagementType value() default CONTAINER;

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java Thu Jan 14
16:19:07 2010
@@ -44,4 +44,6 @@
     String mappedName() default "";
 
     String description() default "";
+
+    String lookup() default "";
 }

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java Thu Jan 14
16:19:07 2010
@@ -26,7 +26,7 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.ElementType.METHOD;
 
-@java.lang.annotation.Target(value = {METHOD, TYPE})
+@java.lang.annotation.Target(value = {TYPE, METHOD})
 @java.lang.annotation.Retention(value = RUNTIME)
 public @interface Lock {
     javax.ejb.LockType value() default WRITE;

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java
(original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java
Thu Jan 14 16:19:07 2010
@@ -24,7 +24,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-public final class ScheduleExpression implements Serializable {
+public class ScheduleExpression implements Serializable {
 
     private static final long serialVersionUID = -3813254457230997879L;
     

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java
(original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java
Thu Jan 14 16:19:07 2010
@@ -25,10 +25,9 @@
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 
-@Target(value = {METHOD, TYPE})
+@Target(value = {TYPE})
 @Retention(value = RUNTIME)
 public @interface StatefulTimeout {
     long value();

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java Thu
Jan 14 16:19:07 2010
@@ -41,7 +41,7 @@
 
     Timer createTimer(long duration, Serializable info) throws IllegalArgumentException,
IllegalStateException, EJBException;
 
-    Collection getTimers() throws IllegalStateException, EJBException;
+    Collection<Timer> getTimers() throws IllegalStateException, EJBException;
 
     Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException,
IllegalStateException, EJBException;
 

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/interceptor/Interceptor.java?rev=899269&r1=899268&r2=899269&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/interceptor/Interceptor.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/interceptor/Interceptor.java
Thu Jan 14 16:19:07 2010
@@ -20,25 +20,18 @@
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Stereotype;
-
 /**
  * Annotation for used defining the interceptors.
  *
  * @version $Rev$ $Id: Interceptor.java 782259 2009-06-06 13:31:32Z gerdogdu $
  */
 @Retention(RUNTIME)
-@Target({TYPE,METHOD,FIELD})
-@Stereotype
-@Inherited
+@Target({TYPE})
 @Documented
 public @interface Interceptor
 {



Mime
View raw message