[jboss-cvs] JBossAS SVN: r108636 - in branches/weld-snapshot-integration: depchain and 1 other directories.

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

Author: marius.bogoevici
Date: 2010-10-18 12:57:37 -0400 (Mon, 18 Oct 2010)
New Revision: 108636

Modified:
   branches/weld-snapshot-integration/build/build.xml
   branches/weld-snapshot-integration/depchain/pom.xml
   branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml
Log:
Moved jboss-interceptor-* out of weld.deployer

Modified: branches/weld-snapshot-integration/build/build.xml
===================================================================
--- branches/weld-snapshot-integration/build/build.xml	2010-10-18 16:54:38 UTC (rev 108635)
+++ branches/weld-snapshot-integration/build/build.xml	2010-10-18 16:57:37 UTC (rev 108636)
@@ -2119,6 +2119,8 @@
       <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
       <fileset refid="org.jboss.weld:weld-api:jar"/>
+      <fileset refid="org.jboss.interceptor:jboss-interceptor-spi:jar"/>
+      <fileset refid="org.jboss.interceptor:jboss-interceptor-core:jar"/>
       <fileset refid="org.hornetq:hornetq-jboss-as-integration:jar"/>
       <fileset refid="org.hornetq:hornetq-bootstrap:jar"/>
       <fileset refid="org.hornetq:hornetq-core:jar"/>
@@ -2383,6 +2385,8 @@
       <fileset refid="org.codehaus.jettison:jettison:jar"/>
       <fileset refid="org.jboss.netty:netty:jar"/>
       <fileset refid="org.jboss.weld:weld-api:jar"/>
+      <fileset refid="org.jboss.interceptor:jboss-interceptor-spi:jar"/>
+      <fileset refid="org.jboss.interceptor:jboss-interceptor-core:jar"/>
       <fileset refid="org.hornetq:hornetq-core-client:jar"/>
       <fileset refid="org.hornetq:hornetq-jms-client:jar"/>
       <fileset refid="org.jboss:jbossxb:jar"/>

Modified: branches/weld-snapshot-integration/depchain/pom.xml
===================================================================
--- branches/weld-snapshot-integration/depchain/pom.xml	2010-10-18 16:54:38 UTC (rev 108635)
+++ branches/weld-snapshot-integration/depchain/pom.xml	2010-10-18 16:57:37 UTC (rev 108636)
@@ -1043,6 +1043,14 @@
       <artifactId>weld-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.interceptor</groupId>
+      <artifactId>jboss-interceptor-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.interceptor</groupId>
+      <artifactId>jboss-interceptor-core</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.ws.cxf</groupId>
       <artifactId>jbossws-cxf-client</artifactId>
     </dependency>

Modified: branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml
===================================================================
--- branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml	2010-10-18 16:54:38 UTC (rev 108635)
+++ branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml	2010-10-18 16:57:37 UTC (rev 108636)
@@ -41,8 +41,6 @@
             <include>org.jboss.jbossas:weld-int-ejb</include>
             <include>org.jboss.jbossas:weld-int-deployer</include>
             <include>org.jboss.jbossas:weld-int-deployer-mc-int</include>
-            <include>org.jboss.interceptor:jboss-interceptor-spi</include>
-            <include>org.jboss.interceptor:jboss-interceptor-core</include>
          </includes>
       </dependencySet>
       <dependencySet>