[jboss-cvs] JBossAS SVN: r106957 - in trunk: testsuite and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 20 17:50:49 EDT 2010


Author: stan.silvert at jboss.com
Date: 2010-07-20 17:50:48 -0400 (Tue, 20 Jul 2010)
New Revision: 106957

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/build.xml
   trunk/testsuite/pom.xml
   trunk/weld-int/deployer/pom.xml
   trunk/weld-int/ejb/pom.xml
   trunk/weld-int/webtier/pom.xml
Log:
JBAS-7739 Revert back to Mojarra 2.0.2


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-07-20 21:28:37 UTC (rev 106956)
+++ trunk/component-matrix/pom.xml	2010-07-20 21:50:48 UTC (rev 106957)
@@ -47,7 +47,7 @@
     <version.rhq>1.4.0.B01</version.rhq>
     <version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
     <version.javassist>3.12.1.GA</version.javassist>
-    <version.javax.faces>2.0.3-20100630.jar</version.javax.faces>
+    <version.javax.faces>2.0.2-FCS</version.javax.faces>
     <version.javax.validation>1.0.0.GA</version.javax.validation>
     <version.jaxrpc.api>1.1</version.jaxrpc.api>
     <version.jboss.jaxr>2.0.1</version.jboss.jaxr>
@@ -58,7 +58,7 @@
     <version.jboss.jbossws-framework>3.4.0.Beta1</version.jboss.jbossws-framework>
     <version.jboss.jbossws-spi>1.4.0.Beta1</version.jboss.jbossws-spi>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
-    <version.jboss.jsf-deployer>1.0.1</version.jboss.jsf-deployer>
+    <version.jboss.jsf-deployer>1.0.0</version.jboss.jsf-deployer>
     <version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
@@ -113,7 +113,7 @@
    <version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
     <version.org.jboss.interceptor>1.0.0-CR11</version.org.jboss.interceptor>
     <version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
-    <version.org.jboss.javaee.specs.bom>1.0.0.Beta4</version.org.jboss.javaee.specs.bom>
+    <version.org.jboss.javaee.specs.bom>1.0.0.Beta3</version.org.jboss.javaee.specs.bom>
     <version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.4.0.CR2</version.org.jboss.jopr>
     <version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
@@ -731,7 +731,7 @@
       </dependency>
       
       <dependency>
-        <groupId>com.sun.faces</groupId>
+        <groupId>javax.faces</groupId>
         <artifactId>jsf-impl</artifactId>
         <version>${version.javax.faces}</version>
       </dependency>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2010-07-20 21:28:37 UTC (rev 106956)
+++ trunk/testsuite/build.xml	2010-07-20 21:50:48 UTC (rev 106957)
@@ -251,7 +251,7 @@
       <fileset refid="sun-jaxb:jaxb-api:jar"/>
       <fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
       <fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
-      <fileset refid="com.sun.faces:jsf-api:jar"/>
+      <fileset refid="javax.faces:jsf-api:jar"/>
       <fileset refid="javax.validation:validation-api:jar"/>
       <fileset refid="org.jboss.web:jasper-jdt:jar"/>
       <fileset refid="org.jboss.web:jbossweb:jar"/>

Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml	2010-07-20 21:28:37 UTC (rev 106956)
+++ trunk/testsuite/pom.xml	2010-07-20 21:50:48 UTC (rev 106957)
@@ -85,12 +85,12 @@
       <artifactId>jstl</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.faces</groupId>
+      <groupId>javax.faces</groupId>
       <artifactId>jsf-api</artifactId>
     </dependency>
     <!--
     <dependency>
-      <groupId>com.sun.faces</groupId>
+      <groupId>javax.faces</groupId>
       <artifactId>jsf-impl</artifactId>
     </dependency>
     -->

Modified: trunk/weld-int/deployer/pom.xml
===================================================================
--- trunk/weld-int/deployer/pom.xml	2010-07-20 21:28:37 UTC (rev 106956)
+++ trunk/weld-int/deployer/pom.xml	2010-07-20 21:50:48 UTC (rev 106957)
@@ -1,421 +1,421 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <parent>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-weld-int</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-   </parent>
-   
-   <groupId>org.jboss.jbossas</groupId>
-   <artifactId>weld-int-deployer</artifactId>
-   <packaging>jar</packaging>
-   <name>JBoss Application Server Weld Integration MC Deployers</name>
-   <description>Weld deployers for JBoss AS</description>
-   
-   <build>
-     <plugins>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-jar-plugin</artifactId>
-         <executions>
-           <execution>
-             <goals>
-               <goal>test-jar</goal>
-             </goals>
-             <phase>test</phase>
-           </execution>
-         </executions>
-       </plugin>
-     </plugins>
-   </build>
-   
-   <dependencies>
-      
-    <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.weld</groupId>
-      <artifactId>weld-spi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <!--<dependency>-->
-      <!--<groupId>org.jboss.logging</groupId>-->
-      <!--<artifactId>jboss-logging-spi</artifactId>-->
-      <!--<scope>provided</scope>-->
-    <!--</dependency>-->
-    
-    <dependency>
-      <groupId>org.jboss.cl</groupId>
-      <artifactId>jboss-classloader</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.deployers</groupId>
-      <artifactId>jboss-deployers-vfs</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-deployers</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>apache-xerces</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.microcontainer</groupId>
-          <artifactId>jboss-dependency</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jaspi-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jca-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jacc-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-transaction-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jms-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-ejb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sun-jaxws</groupId>
-          <artifactId>jsr181-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>quartz</groupId>
-          <artifactId>quartz</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sun-jaxws</groupId>
-          <artifactId>jaxws-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata-ejb</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-ejb-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-jca-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-jms-api</artifactId>
-          </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.kernel</groupId>
-      <artifactId>jboss-dependency</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.kernel</groupId>
-      <artifactId>jboss-kernel</artifactId>
-      <optional>true</optional>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.kernel</groupId>
-          <artifactId>jboss-dependency</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jbossxb</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jbossxb</artifactId>
-      <optional>true</optional>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-reflect</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.man</groupId>
-      <artifactId>jboss-managed</artifactId>
-      <optional>true</optional>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-reflect</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-mdr</artifactId>
-      <optional>true</optional>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-reflect</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- Test dependencies -->
-
-    <dependency>
-      <groupId>org.jboss.deployers</groupId>
-      <artifactId>jboss-deployers-vfs</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-      <!--
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss.deployers</groupId>
-          <artifactId>jboss-deployers-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.deployers</groupId>
-          <artifactId>jboss-deployers-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.kernel</groupId>
-          <artifactId>jboss-kernel</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.cl</groupId>
-          <artifactId>jboss-classloading</artifactId>
-        </exclusion>
-      </exclusions>
-      -->
-    </dependency>
-
-    <dependency>
-        <groupId>org.jboss.reloaded</groupId>
-        <artifactId>jboss-reloaded-naming-deployers</artifactId>
-        <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.test</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.spec.javax.servlet</groupId>
-      <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.sun.faces</groupId>
-      <artifactId>jsf-api</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-       
-       <dependency>
-         <groupId>org.jboss.ejb3</groupId>
-         <artifactId>jboss-ejb3-core</artifactId>
-         <scope>provided</scope>
-         <exclusions>
-           <exclusion>
-              <groupId>org.jboss.microcontainer</groupId>
-              <artifactId>jboss-kernel</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>apache-xerces</groupId>
-             <artifactId>xml-apis</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.microcontainer</groupId>
-             <artifactId>jboss-dependency</artifactId>
-           </exclusion>
-            <exclusion>
-               <groupId>org.jboss.microcontainer</groupId>
-               <artifactId>jboss-aop-mc-int</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.javaee</groupId>
-             <artifactId>jboss-jaspi-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.javaee</groupId>
-             <artifactId>jboss-jca-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.javaee</groupId>
-             <artifactId>jboss-jacc-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.javaee</groupId>
-             <artifactId>jboss-transaction-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.javaee</groupId>
-             <artifactId>jboss-jms-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.javaee</groupId>
-             <artifactId>jboss-ejb-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.logging</groupId>
-             <artifactId>jboss-logging-spi</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jboss.logging</groupId>
-             <artifactId>jboss-logging-log4j</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>sun-jaxws</groupId>
-             <artifactId>jsr181-api</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>quartz</groupId>
-             <artifactId>quartz</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>sun-jaxws</groupId>
-             <artifactId>jaxws-api</artifactId>
-           </exclusion>
-         </exclusions>
-       </dependency>
-      
-   </dependencies>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-weld-int</artifactId>
+      <version>6.0.0-SNAPSHOT</version>
+   </parent>
+   
+   <groupId>org.jboss.jbossas</groupId>
+   <artifactId>weld-int-deployer</artifactId>
+   <packaging>jar</packaging>
+   <name>JBoss Application Server Weld Integration MC Deployers</name>
+   <description>Weld deployers for JBoss AS</description>
+   
+   <build>
+     <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-jar-plugin</artifactId>
+         <executions>
+           <execution>
+             <goals>
+               <goal>test-jar</goal>
+             </goals>
+             <phase>test</phase>
+           </execution>
+         </executions>
+       </plugin>
+     </plugins>
+   </build>
+   
+   <dependencies>
+      
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-spi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <!--<dependency>-->
+      <!--<groupId>org.jboss.logging</groupId>-->
+      <!--<artifactId>jboss-logging-spi</artifactId>-->
+      <!--<scope>provided</scope>-->
+    <!--</dependency>-->
+    
+    <dependency>
+      <groupId>org.jboss.cl</groupId>
+      <artifactId>jboss-classloader</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.deployers</groupId>
+      <artifactId>jboss-deployers-vfs</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-deployers</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>apache-xerces</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.microcontainer</groupId>
+          <artifactId>jboss-dependency</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jaspi-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jca-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jacc-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-transaction-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jms-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-ejb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jsr181-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>quartz</groupId>
+          <artifactId>quartz</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jaxws-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata-ejb</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-ejb-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-jca-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-jms-api</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.kernel</groupId>
+      <artifactId>jboss-dependency</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.kernel</groupId>
+      <artifactId>jboss-kernel</artifactId>
+      <optional>true</optional>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.kernel</groupId>
+          <artifactId>jboss-dependency</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jbossxb</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jbossxb</artifactId>
+      <optional>true</optional>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-reflect</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.man</groupId>
+      <artifactId>jboss-managed</artifactId>
+      <optional>true</optional>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-reflect</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-mdr</artifactId>
+      <optional>true</optional>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-reflect</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- Test dependencies -->
+
+    <dependency>
+      <groupId>org.jboss.deployers</groupId>
+      <artifactId>jboss-deployers-vfs</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+      <!--
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.deployers</groupId>
+          <artifactId>jboss-deployers-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.deployers</groupId>
+          <artifactId>jboss-deployers-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.kernel</groupId>
+          <artifactId>jboss-kernel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.cl</groupId>
+          <artifactId>jboss-classloading</artifactId>
+        </exclusion>
+      </exclusions>
+      -->
+    </dependency>
+
+    <dependency>
+        <groupId>org.jboss.reloaded</groupId>
+        <artifactId>jboss-reloaded-naming-deployers</artifactId>
+        <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.test</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.spec.javax.servlet</groupId>
+      <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.faces</groupId>
+      <artifactId>jsf-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+       
+       <dependency>
+         <groupId>org.jboss.ejb3</groupId>
+         <artifactId>jboss-ejb3-core</artifactId>
+         <scope>provided</scope>
+         <exclusions>
+           <exclusion>
+              <groupId>org.jboss.microcontainer</groupId>
+              <artifactId>jboss-kernel</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>apache-xerces</groupId>
+             <artifactId>xml-apis</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.microcontainer</groupId>
+             <artifactId>jboss-dependency</artifactId>
+           </exclusion>
+            <exclusion>
+               <groupId>org.jboss.microcontainer</groupId>
+               <artifactId>jboss-aop-mc-int</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.javaee</groupId>
+             <artifactId>jboss-jaspi-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.javaee</groupId>
+             <artifactId>jboss-jca-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.javaee</groupId>
+             <artifactId>jboss-jacc-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.javaee</groupId>
+             <artifactId>jboss-transaction-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.javaee</groupId>
+             <artifactId>jboss-jms-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.javaee</groupId>
+             <artifactId>jboss-ejb-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.logging</groupId>
+             <artifactId>jboss-logging-spi</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jboss.logging</groupId>
+             <artifactId>jboss-logging-log4j</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>sun-jaxws</groupId>
+             <artifactId>jsr181-api</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>quartz</groupId>
+             <artifactId>quartz</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>sun-jaxws</groupId>
+             <artifactId>jaxws-api</artifactId>
+           </exclusion>
+         </exclusions>
+       </dependency>
+      
+   </dependencies>
+
+</project>

Modified: trunk/weld-int/ejb/pom.xml
===================================================================
--- trunk/weld-int/ejb/pom.xml	2010-07-20 21:28:37 UTC (rev 106956)
+++ trunk/weld-int/ejb/pom.xml	2010-07-20 21:50:48 UTC (rev 106957)
@@ -1,346 +1,346 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.jboss.jbossas</groupId>
-    <artifactId>jboss-as-weld-int</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-  </parent>
-    
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.jboss.jbossas</groupId>
-  <artifactId>weld-int-ejb</artifactId>
-  <packaging>jar</packaging>
-  <name>JBoss Application Server Weld Integration EE services</name>
-  
-  <!-- Do not add version information here, use ../pom.xml instead -->
-  <dependencies>
-  
-    <!-- Global dependencies -->
-        
-    <dependency>
-      <groupId>org.jboss.weld</groupId>
-      <artifactId>weld-spi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-common</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>apache-xerces</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.microcontainer</groupId>
-          <artifactId>jboss-dependency</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jaspi-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jca-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jacc-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-transaction-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jms-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-ejb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sun-jaxws</groupId>
-          <artifactId>jsr181-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>quartz</groupId>
-          <artifactId>quartz</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sun-jaxws</groupId>
-          <artifactId>jaxws-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-core</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-           <groupId>org.jboss.microcontainer</groupId>
-           <artifactId>jboss-kernel</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>apache-xerces</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.microcontainer</groupId>
-          <artifactId>jboss-dependency</artifactId>
-        </exclusion>
-        <exclusion>
-               <groupId>org.jboss.microcontainer</groupId>
-               <artifactId>jboss-aop-mc-int</artifactId>
-           </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jaspi-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jca-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jacc-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-transaction-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-jms-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.javaee</groupId>
-          <artifactId>jboss-ejb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sun-jaxws</groupId>
-          <artifactId>jsr181-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>quartz</groupId>
-          <artifactId>quartz</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sun-jaxws</groupId>
-          <artifactId>jaxws-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
-      <exclusions>
-          <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-spi</artifactId>
-          </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-        <groupId>org.jboss.ejb3</groupId>
-        <artifactId>jboss-ejb3-proxy-impl</artifactId>
-        <exclusions>
-		   	<exclusion>
-	               <groupId>apache-xerces</groupId>
-	               <artifactId>xml-apis</artifactId>
-	           </exclusion>
-	       		<exclusion>
-		               <groupId>jboss.web</groupId>
-		               <artifactId>servlet-api</artifactId>
-		           </exclusion>
-           <exclusion>
-               <groupId>org.jboss.microcontainer</groupId>
-               <artifactId>jboss-kernel</artifactId>
-           </exclusion>
-	    	<exclusion>
-               <groupId>org.jboss.microcontainer</groupId>
-               <artifactId>jboss-dependency</artifactId>
-           </exclusion>
-	       <exclusion>
-               <groupId>org.jboss.microcontainer</groupId>
-               <artifactId>jboss-aop-mc-int</artifactId>
-           </exclusion>
-		   <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-jaspi-api</artifactId>
-           </exclusion>
-		   <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-jms-api</artifactId>
-           </exclusion>
-		   <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-transaction-api</artifactId>
-           </exclusion>
-		   <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-ejb-api</artifactId>
-           </exclusion>
-		   <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-jacc-api</artifactId>
-           </exclusion>
-		   <exclusion>
-               <groupId>org.jboss.logging</groupId>
-               <artifactId>jboss-logging-spi</artifactId>
-           </exclusion>
-
-        </exclusions>
-    </dependency>
-    
-    <dependency>
-       <groupId>org.jboss.jpa</groupId>
-       <artifactId>jboss-jpa-deployers</artifactId>
-       <exclusions>
-           <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-transaction-api</artifactId>
-           </exclusion>
-           <exclusion>
-               <groupId>org.jboss.javaee</groupId>
-               <artifactId>jboss-jca-api</artifactId>
-           </exclusion>
-       </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.jbossts</groupId>
-      <artifactId>jbossjts-integration</artifactId>
-       <exclusions>
-          <exclusion>
-              <groupId>ant</groupId>
-              <artifactId>ant</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-ejb-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-jca-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-transaction-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-spi</artifactId>
-          </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.sun.faces</groupId>
-      <artifactId>jsf-api</artifactId>
-    </dependency>
-
-    <dependency>
-        <groupId>org.jboss.spec.javax.interceptor</groupId>
-        <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
-    </dependency>
-    
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.jboss.test</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.logging</groupId>
-          <artifactId>jboss-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata-ejb</artifactId>
-      <exclusions>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-ejb-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-jca-api</artifactId>
-          </exclusion>
-          <exclusion>
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-jms-api</artifactId>
-          </exclusion>
-      </exclusions>
-    </dependency>
-
-  </dependencies>  
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.jboss.jbossas</groupId>
+    <artifactId>jboss-as-weld-int</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+  </parent>
+    
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.jbossas</groupId>
+  <artifactId>weld-int-ejb</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss Application Server Weld Integration EE services</name>
+  
+  <!-- Do not add version information here, use ../pom.xml instead -->
+  <dependencies>
+  
+    <!-- Global dependencies -->
+        
+    <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-spi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-common</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>apache-xerces</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.microcontainer</groupId>
+          <artifactId>jboss-dependency</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jaspi-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jca-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jacc-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-transaction-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jms-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-ejb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jsr181-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>quartz</groupId>
+          <artifactId>quartz</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jaxws-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-core</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+           <groupId>org.jboss.microcontainer</groupId>
+           <artifactId>jboss-kernel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>apache-xerces</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.microcontainer</groupId>
+          <artifactId>jboss-dependency</artifactId>
+        </exclusion>
+        <exclusion>
+               <groupId>org.jboss.microcontainer</groupId>
+               <artifactId>jboss-aop-mc-int</artifactId>
+           </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jaspi-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jca-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jacc-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-transaction-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-jms-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.javaee</groupId>
+          <artifactId>jboss-ejb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jsr181-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>quartz</groupId>
+          <artifactId>quartz</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jaxws-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+      <exclusions>
+          <exclusion>
+              <groupId>org.jboss.logging</groupId>
+              <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+        <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-proxy-impl</artifactId>
+        <exclusions>
+		   	<exclusion>
+	               <groupId>apache-xerces</groupId>
+	               <artifactId>xml-apis</artifactId>
+	           </exclusion>
+	       		<exclusion>
+		               <groupId>jboss.web</groupId>
+		               <artifactId>servlet-api</artifactId>
+		           </exclusion>
+           <exclusion>
+               <groupId>org.jboss.microcontainer</groupId>
+               <artifactId>jboss-kernel</artifactId>
+           </exclusion>
+	    	<exclusion>
+               <groupId>org.jboss.microcontainer</groupId>
+               <artifactId>jboss-dependency</artifactId>
+           </exclusion>
+	       <exclusion>
+               <groupId>org.jboss.microcontainer</groupId>
+               <artifactId>jboss-aop-mc-int</artifactId>
+           </exclusion>
+		   <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-jaspi-api</artifactId>
+           </exclusion>
+		   <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-jms-api</artifactId>
+           </exclusion>
+		   <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-transaction-api</artifactId>
+           </exclusion>
+		   <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-ejb-api</artifactId>
+           </exclusion>
+		   <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-jacc-api</artifactId>
+           </exclusion>
+		   <exclusion>
+               <groupId>org.jboss.logging</groupId>
+               <artifactId>jboss-logging-spi</artifactId>
+           </exclusion>
+
+        </exclusions>
+    </dependency>
+    
+    <dependency>
+       <groupId>org.jboss.jpa</groupId>
+       <artifactId>jboss-jpa-deployers</artifactId>
+       <exclusions>
+           <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-transaction-api</artifactId>
+           </exclusion>
+           <exclusion>
+               <groupId>org.jboss.javaee</groupId>
+               <artifactId>jboss-jca-api</artifactId>
+           </exclusion>
+       </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.jbossts</groupId>
+      <artifactId>jbossjts-integration</artifactId>
+       <exclusions>
+          <exclusion>
+              <groupId>ant</groupId>
+              <artifactId>ant</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-ejb-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-jca-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-transaction-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.logging</groupId>
+              <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.faces</groupId>
+      <artifactId>jsf-api</artifactId>
+    </dependency>
+
+    <dependency>
+        <groupId>org.jboss.spec.javax.interceptor</groupId>
+        <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+    </dependency>
+    
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.jboss.test</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata-ejb</artifactId>
+      <exclusions>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-ejb-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-jca-api</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-jms-api</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+
+  </dependencies>  
+</project>

Modified: trunk/weld-int/webtier/pom.xml
===================================================================
--- trunk/weld-int/webtier/pom.xml	2010-07-20 21:28:37 UTC (rev 106956)
+++ trunk/weld-int/webtier/pom.xml	2010-07-20 21:50:48 UTC (rev 106957)
@@ -1,93 +1,93 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.jboss.jbossas</groupId>
-        <artifactId>jboss-as-weld-int</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jboss.jbossas</groupId>
-    <artifactId>weld-int-webtier</artifactId>
-    <packaging>jar</packaging>
-    <name>JBoss Application Server Weld Integration EE Webtier services</name>
-
-    <!-- Do not add version information here, use ../pom.xml instead -->
-    <dependencies>
-
-        <!-- Global dependencies -->
-
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.faces</groupId>
-            <artifactId>jsf-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
-            <artifactId>jboss-jsp-api_2.2_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.web</groupId>
-            <artifactId>jbossweb</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.jboss.test</groupId>
-            <artifactId>jboss-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jboss-common-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.logging</groupId>
-                    <artifactId>jboss-logging-spi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.logging</groupId>
-                    <artifactId>jboss-logging-log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jboss.profiler.jvmti</groupId>
-                    <artifactId>jboss-profiler-jvmti</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossas</groupId>
+        <artifactId>jboss-as-weld-int</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossas</groupId>
+    <artifactId>weld-int-webtier</artifactId>
+    <packaging>jar</packaging>
+    <name>JBoss Application Server Weld Integration EE Webtier services</name>
+
+    <!-- Do not add version information here, use ../pom.xml instead -->
+    <dependencies>
+
+        <!-- Global dependencies -->
+
+        <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+            <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.web</groupId>
+            <artifactId>jbossweb</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.jboss.test</groupId>
+            <artifactId>jboss-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss</groupId>
+                    <artifactId>jboss-common-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.logging</groupId>
+                    <artifactId>jboss-logging-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.logging</groupId>
+                    <artifactId>jboss-logging-log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jboss.profiler.jvmti</groupId>
+                    <artifactId>jboss-profiler-jvmti</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>



More information about the jboss-cvs-commits mailing list