geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r906902 - in /geronimo/specs/trunk: geronimo-atinject_1.0_spec/src/main/java/javax/inject/ geronimo-el_2.2_spec/src/main/java/javax/el/ geronimo-jcdi_1.0_spec/ geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ geronimo-jcdi_1.0...
Date Fri, 05 Feb 2010 11:23:24 GMT
Author: rickmcguire
Date: Fri Feb  5 11:23:22 2010
New Revision: 906902

URL: http://svn.apache.org/viewvc?rev=906902&view=rev
Log:
GERONIMO-5121 Update geronimo-jcdi and geronimo-atinject to pass TCK Signature Tests

Patch provided by Gurkan Erdogdu


Modified:
    geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Inject.java
    geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Named.java
    geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Qualifier.java
    geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Scope.java
    geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Singleton.java
    geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/CompositeELResolver.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java

Modified: geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Inject.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Inject.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Inject.java
(original)
+++ geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Inject.java
Fri Feb  5 11:23:22 2010
@@ -30,9 +30,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Documented
 @Target(value={ElementType.METHOD,ElementType.CONSTRUCTOR,ElementType.FIELD})
 @Retention(value=RetentionPolicy.RUNTIME)
+@Documented
 public @interface Inject 
 {
     

Modified: geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Named.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Named.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Named.java
(original)
+++ geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Named.java
Fri Feb  5 11:23:22 2010
@@ -35,9 +35,9 @@
  * given webbeans component, its name is null.
  * </p>
  */
+@Qualifier
 @Documented
 @Retention(value=RetentionPolicy.RUNTIME)
-@Qualifier
 public @interface Named 
 {
  

Modified: geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Qualifier.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Qualifier.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Qualifier.java
(original)
+++ geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Qualifier.java
Fri Feb  5 11:23:22 2010
@@ -30,9 +30,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Documented
 @Target(value=ElementType.ANNOTATION_TYPE)
 @Retention(value=RetentionPolicy.RUNTIME)
+@Documented
 public @interface Qualifier 
 {
 

Modified: geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Scope.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Scope.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Scope.java
(original)
+++ geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Scope.java
Fri Feb  5 11:23:22 2010
@@ -30,9 +30,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Documented
 @Target(value=ElementType.ANNOTATION_TYPE)
 @Retention(value=RetentionPolicy.RUNTIME)
+@Documented
 public @interface Scope 
 {
     

Modified: geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Singleton.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Singleton.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Singleton.java
(original)
+++ geronimo/specs/trunk/geronimo-atinject_1.0_spec/src/main/java/javax/inject/Singleton.java
Fri Feb  5 11:23:22 2010
@@ -28,8 +28,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-@Documented
 @Scope
+@Documented
 @Retention(value=RetentionPolicy.RUNTIME)
 public @interface Singleton 
 {

Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/CompositeELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/CompositeELResolver.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/CompositeELResolver.java
(original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/src/main/java/javax/el/CompositeELResolver.java
Fri Feb  5 11:23:22 2010
@@ -26,9 +26,12 @@
 
 	private ELResolver[] resolvers;
 
+    private ExpressionFactory expressionFactory;
+
 	public CompositeELResolver() {
 		this.size = 0;
 		this.resolvers = new ELResolver[2];
+		expressionFactory = ExpressionFactory.newInstance();
 	}
 
 	synchronized public void add(ELResolver elResolver) {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml Fri Feb  5 11:23:22 2010
@@ -77,8 +77,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0.2</version>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -92,7 +92,7 @@
             <artifactId>jsr250-api</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
Fri Feb  5 11:23:22 2010
@@ -39,7 +39,7 @@
 public class BusyConversationException extends ContextException
 {
 
-    private static final long serialVersionUID = 4783816486073845333L;
+    private static final long serialVersionUID = -3599813072560026919L ;
     
     public BusyConversationException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java
Fri Feb  5 11:23:22 2010
@@ -20,7 +20,7 @@
 
 public class ContextException extends RuntimeException 
 {
-	private static final long serialVersionUID = 3338309667037125674L;
+	private static final long serialVersionUID = -3599813072560026919L;
 
 	public ContextException()
 	{

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
Fri Feb  5 11:23:22 2010
@@ -32,7 +32,7 @@
 public class ContextNotActiveException extends ContextException
 {
 
-    private static final long serialVersionUID = 4783816486073845333L;
+    private static final long serialVersionUID = -3599813072560026919L;
     
     public ContextNotActiveException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
Fri Feb  5 11:23:22 2010
@@ -36,7 +36,7 @@
 public class NonexistentConversationException extends ContextException
 {
 
-    private static final long serialVersionUID = 4783816486073845333L;
+    private static final long serialVersionUID = -3599813072560026919L;
     
     public NonexistentConversationException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java
Fri Feb  5 11:23:22 2010
@@ -25,7 +25,7 @@
  */
 public class ObserverException extends RuntimeException
 {
-    private static final long serialVersionUID = -6392759733390664652L;
+    private static final long serialVersionUID = -801836224808304381L;
 
     /**
      * Creates new exception.

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
Fri Feb  5 11:23:22 2010
@@ -26,7 +26,7 @@
  */
 public class AmbiguousResolutionException extends ResolutionException
 {
-    private static final long serialVersionUID = -870939668365532685L;
+    private static final long serialVersionUID = -2132733164534544788L ;
 
     public AmbiguousResolutionException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java
Fri Feb  5 11:23:22 2010
@@ -20,7 +20,7 @@
 
 public class CreationException extends InjectionException
 {
-    private static final long serialVersionUID = -3952691051791639005L;
+    private static final long serialVersionUID = 1002854668862145298L;
 
     public CreationException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java
Fri Feb  5 11:23:22 2010
@@ -26,7 +26,7 @@
  */
 public class IllegalProductException extends InjectionException
 {
-    private static final long serialVersionUID = 1490337449170464997L;
+    private static final long serialVersionUID = -6280627846071966243L;
 
     public IllegalProductException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java
Fri Feb  5 11:23:22 2010
@@ -25,7 +25,7 @@
  */
 public class InjectionException extends RuntimeException
 {
-	private static final long serialVersionUID = -1311377696674849873L;
+	private static final long serialVersionUID = -2132733164534544788L;
 
 	public InjectionException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java
Fri Feb  5 11:23:22 2010
@@ -26,7 +26,7 @@
 public class ResolutionException extends InjectionException
 {
 
-	private static final long serialVersionUID = 625364090562381779L;
+	private static final long serialVersionUID = -6280627846071966243L;
 
 	public ResolutionException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
Fri Feb  5 11:23:22 2010
@@ -28,7 +28,7 @@
  */
 public class UnproxyableResolutionException extends ResolutionException
 {
-    private static final long serialVersionUID = 7022231794856380239L;
+    private static final long serialVersionUID = 1667539354548135465L;
 
     public UnproxyableResolutionException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
Fri Feb  5 11:23:22 2010
@@ -26,7 +26,7 @@
  */
 public class UnsatisfiedResolutionException extends ResolutionException
 {
-    private static final long serialVersionUID = 8476513814387375212L;
+    private static final long serialVersionUID = 5350603312442756709L;
 
     public UnsatisfiedResolutionException()
     {

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
Fri Feb  5 11:23:22 2010
@@ -20,5 +20,10 @@
 
 public enum InterceptionType
 {
-    AROUND_INVOKE, POST_CONSTRUCT, PRE_DESTROY, PRE_PASSIVATE, POST_ACTIVATE, AROUND_TIMEOUT
+    AROUND_INVOKE,
+    AROUND_TIMEOUT,
+    POST_CONSTRUCT, 
+    PRE_DESTROY, 
+    PRE_PASSIVATE,
+    POST_ACTIVATE
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java?rev=906902&r1=906901&r2=906902&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java
(original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java
Fri Feb  5 11:23:22 2010
@@ -26,5 +26,7 @@
  */
 public enum SessionBeanType
 {
-    STATELESS, STATEFUL, SINGLETON
+    STATELESS, 
+    STATEFUL, 
+    SINGLETON
 }



Mime
View raw message