[jboss-cvs] JBossAS SVN: r94642 - in projects/weld-int/trunk: assembly and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2009-10-10 12:18:10 -0400 (Sat, 10 Oct 2009)
New Revision: 94642

Modified:
   projects/weld-int/trunk/assembly/pom.xml
   projects/weld-int/trunk/assembly/src/main/assembly/assembly.xml
   projects/weld-int/trunk/pom.xml
Log:
Use org.jboss.interceptors:jboss-interceptor-api.jar and the newly renamed org.jboss.interceptors:jboss-interceptor.jar

Modified: projects/weld-int/trunk/assembly/pom.xml
===================================================================
--- projects/weld-int/trunk/assembly/pom.xml	2009-10-10 15:16:32 UTC (rev 94641)
+++ projects/weld-int/trunk/assembly/pom.xml	2009-10-10 16:18:10 UTC (rev 94642)
@@ -65,16 +65,23 @@
       <artifactId>weld-jboss-int-deployer</artifactId>
       <optional>true</optional>
     </dependency>
+     
    
     <dependency>
       <groupId>org.jboss.weld</groupId>
       <artifactId>weld-core</artifactId>
       <optional>true</optional>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.interceptor</groupId>
+      <artifactId>jboss-interceptor-api</artifactId>
+      <optional>true</optional>
+    </dependency>
     
     <dependency>
-      <groupId>org.jboss.interceptors</groupId>
-      <artifactId>interceptors</artifactId>
+      <groupId>org.jboss.interceptor</groupId>
+      <artifactId>jboss-interceptor</artifactId>
       <optional>true</optional>
     </dependency>
       

Modified: projects/weld-int/trunk/assembly/src/main/assembly/assembly.xml
===================================================================
--- projects/weld-int/trunk/assembly/src/main/assembly/assembly.xml	2009-10-10 15:16:32 UTC (rev 94641)
+++ projects/weld-int/trunk/assembly/src/main/assembly/assembly.xml	2009-10-10 16:18:10 UTC (rev 94642)
@@ -32,7 +32,8 @@
             <include>org.jboss.weld.integration:weld-jboss-int-jboss-ejb</include>
             <include>org.jboss.weld.integration:weld-jboss-int-deployer</include>
             <include>org.jboss.weld.integration:weld-jboss-int-webtier</include>
-            <include>org.jboss.interceptors:interceptors</include>
+            <include>org.jboss.interceptor:jboss-interceptor-api</include>
+            <include>org.jboss.interceptor:jboss-interceptor</include>
          </includes>
       </dependencySet>
       <dependencySet>

Modified: projects/weld-int/trunk/pom.xml
===================================================================
--- projects/weld-int/trunk/pom.xml	2009-10-10 15:16:32 UTC (rev 94641)
+++ projects/weld-int/trunk/pom.xml	2009-10-10 16:18:10 UTC (rev 94642)
@@ -15,7 +15,7 @@
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/weld-int/trunk/</developerConnection>
     <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/weld-int/trunk/</url>
   </scm>
-
+                                         
   <modules>
     <module>ejb</module>
     <module>webtier</module>
@@ -25,7 +25,7 @@
   
   <properties>
     <version.weld>1.0.0-SNAPSHOT</version.weld>
-    <version.jboss.interceptors>1.0.0-SNAPSHOT</version.jboss.interceptors>
+    <version.jboss.interceptor>1.0.0-SNAPSHOT</version.jboss.interceptor>
     <version.jboss.vfs>2.1.2.GA</version.jboss.vfs>
     <version.jboss.man>2.1.0.GA</version.jboss.man>
     <version.jboss.microcontainer>2.0.8.GA</version.jboss.microcontainer>
@@ -49,6 +49,7 @@
     <version.validation>1.0.CR3</version.validation>
     <version.jbossts>4.6.1.GA</version.jbossts>
     <version.faces>2.0.0-RC</version.faces>
+    <version.interceptor.api>3.1.0-SNAPSHOT</version.interceptor.api>
   </properties>
 
   <build>
@@ -361,11 +362,17 @@
         <artifactId>weld-spi</artifactId>
         <version>${version.weld}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.interceptor</groupId>
+        <artifactId>jboss-interceptor-api</artifactId>
+        <version>${version.interceptor.api}</version>
+      </dependency>
       
       <dependency>
-        <groupId>org.jboss.interceptors</groupId>
-        <artifactId>interceptors</artifactId>
-        <version>${version.jboss.interceptors}</version>
+        <groupId>org.jboss.interceptor</groupId>
+        <artifactId>jboss-interceptor</artifactId>
+        <version>${version.jboss.interceptor}</version>
       </dependency>
       
       <dependency>