[richfaces-svn-commits] JBoss Rich Faces SVN: r18977 - in trunk/examples/richfaces-showcase: src/main/webapp/WEB-INF and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: jbalunas at redhat.com
Date: 2010-08-25 17:59:45 -0400 (Wed, 25 Aug 2010)
New Revision: 18977

Added:
   trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml
Modified:
   trunk/examples/richfaces-showcase/pom.xml
Log:
RFPL-772 Working around JBAS-8361 for richfaces-showcase

Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml	2010-08-25 20:08:18 UTC (rev 18976)
+++ trunk/examples/richfaces-showcase/pom.xml	2010-08-25 21:59:45 UTC (rev 18977)
@@ -281,12 +281,8 @@
                                 <configuration>
                                     <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
                                     <classifier>jee6</classifier>
-                                    <!--
-                                        For JBoss AS 6 integration there is a conflict with guava, and
-                                        google-collections. So excluding guava is required
-                                    -->
-                                    <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</packagingExcludes>
-                                    <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*,WEB-INF/lib/guava-*</warSourceExcludes>
+                                    <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes>
+                                    <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes>
                                     <webResources>
                                         <resource>
                                             <directory>${basedir}/src/main/java</directory>
@@ -362,21 +358,6 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>org.richfaces.ui</groupId>
-                    <artifactId>richfaces-components-api</artifactId>
-                    <!--
-                        For JBoss AS 6 integration there is a conflict
-                        with guava, and google-collections. So this is
-                        required until this is resolved.
-                    -->
-                    <exclusions>
-                        <exclusion>
-                            <artifactId>guava</artifactId>
-                            <groupId>com.google.guava</groupId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
                     <groupId>com.sun.faces</groupId>
                     <artifactId>jsf-api</artifactId>
                     <scope>provided</scope>

Added: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml	                        (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml	2010-08-25 21:59:45 UTC (rev 18977)
@@ -0,0 +1,11 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!--
+    For JBoss AS 6 integration there is a conflict with guava, and
+    google-collections.  JBAS-8361
+-->
+    <path name="WEB-INF/classes"></path>
+
+    <path name="WEB-INF/lib/guava-r05.jar">
+        <exclude name="com.google.common.collect" />
+    </path>
+</scanning>
\ No newline at end of file