[weld-commits] Weld SVN: r5745 - in core/trunk: impl/src/main/java/org/jboss/weld/bootstrap/events and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-02-04 14:37:19 -0500 (Thu, 04 Feb 2010)
New Revision: 5745

Modified:
   core/trunk/bom/pom.xml
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java
Log:
use SP1 of API

Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml	2010-02-04 19:25:11 UTC (rev 5744)
+++ core/trunk/bom/pom.xml	2010-02-04 19:37:19 UTC (rev 5745)
@@ -71,9 +71,8 @@
    </repositories>
 
    <properties>
-      <weld.api.version>1.0</weld.api.version>
+      <weld.api.version>1.0-SP1</weld.api.version>
       <!-- Override the API and compile with more recent EL API -->
-      <uel.api.version>2.2</uel.api.version>
       <google.collections.version>1.0</google.collections.version>
       <javassist.version>3.11.0.GA</javassist.version>
       <cdi.tck.version>1.0.1-CR1</cdi.tck.version>
@@ -94,21 +93,7 @@
             <type>pom</type>
          </dependency>	
 
-         <!-- Remove when we switch API to 1.1 -->
          <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>${uel.api.version}</version>
-         </dependency>
- 
-         <!-- Remove when we switch the API to 1.1 -->
-         <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
-         </dependency>
-
-         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
             <version>${javassist.version}</version>

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java	2010-02-04 19:25:11 UTC (rev 5744)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java	2010-02-04 19:37:19 UTC (rev 5745)
@@ -76,9 +76,13 @@
       getTypeStore().add(bindingType, QualifierLiteral.INSTANCE);
    }
 
-   public void addInterceptorBinding(Class<? extends Annotation> bindingType)
+   public void addInterceptorBinding(Class<? extends Annotation> bindingType, Annotation... bindingTypeDef)
    {
       getTypeStore().add(bindingType, InterceptorBindingTypeLiteral.INSTANCE);
+      for(Annotation a : bindingTypeDef)
+      {
+         getTypeStore().add(bindingType, a);
+      }
    }
 
    public void addScope(Class<? extends Annotation> scopeType, boolean normal, boolean passivating)