[seam-commits] Seam SVN: r15296 - in branches/enterprise/WFK-2_1/examples: excel/excel-web and 10 other directories.

Author: maschmid Date: 2012-10-18 08:58:11 -0400 (Thu, 18 Oct 2012) New Revision: 15296 Modified: branches/enterprise/WFK-2_1/examples/contactlist/contactlist-web/pom.xml branches/enterprise/WFK-2_1/examples/excel/excel-web/pom.xml branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml branches/enterprise/WFK-2_1/examples/itext/itext-web/pom.xml branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml branches/enterprise/WFK-2_1/examples/mail/mail-web/pom.xml branches/enterprise/WFK-2_1/examples/messages/messages-web/pom.xml branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-web/pom.xml branches/enterprise/WFK-2_1/examples/remoting/helloworld/helloworld-web/pom.xml branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml Log: examples web modules servlet and jsf api dependencies fixes Modified: branches/enterprise/WFK-2_1/examples/contactlist/contactlist-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/contactlist/contactlist-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/contactlist/contactlist-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -66,6 +66,11 @@ <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/excel/excel-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/excel/excel-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/excel/excel-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -52,13 +52,17 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <exclusions> - <exclusion> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <groupId>org.jboss.spec.javax.faces</groupId> - </exclusion> - </exclusions> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -113,6 +113,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> <scope>provided</scope> Modified: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -78,6 +78,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.faces</groupId> <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> Modified: branches/enterprise/WFK-2_1/examples/itext/itext-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/itext/itext-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/itext/itext-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -75,6 +75,16 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -45,8 +45,12 @@ <artifactId>jboss-ejb-api_3.1_spec</artifactId> <scope>provided</scope> </dependency> - <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> @@ -60,40 +64,18 @@ <artifactId>junit</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - </exclusion> - <exclusion> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-beanutils</groupId> Modified: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -79,6 +79,11 @@ <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/mail/mail-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/mail/mail-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/mail/mail-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -34,20 +34,6 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-mail</artifactId> - <exclusions> - <exclusion> - <artifactId>jboss-seam-ui</artifactId> - <groupId>org.jboss.seam</groupId> - </exclusion> - <exclusion> - <artifactId>jsf-impl</artifactId> - <groupId>com.sun.faces</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <groupId>org.jboss.spec.javax.faces</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> @@ -60,38 +46,28 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-pdf</artifactId> - <exclusions> - <exclusion> - <artifactId>jboss-seam-ui</artifactId> - <groupId>org.jboss.seam</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-seam</artifactId> - <groupId>org.jboss.seam</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <groupId>org.jboss.spec.javax.faces</groupId> - </exclusion> - </exclusions> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-excel</artifactId> <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <groupId>org.jboss.spec.javax.faces</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.spec.javax.el</groupId> <artifactId>jboss-el-api_2.2_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/messages/messages-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/messages/messages-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/messages/messages-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -27,13 +27,13 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <exclusions> - <exclusion> - <artifactId>jboss-seam</artifactId> - <groupId>org.jboss.seam</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -46,10 +46,15 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.spec.javax.servlet.jstl</groupId> - <artifactId>jboss-jstl-api_1.2_spec</artifactId> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/nestedbooking/nestedbooking-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -53,6 +53,16 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/remoting/helloworld/helloworld-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/remoting/helloworld/helloworld-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/remoting/helloworld/helloworld-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -39,6 +39,16 @@ <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml 2012-10-18 12:57:15 UTC (rev 15295) +++ branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml 2012-10-18 12:58:11 UTC (rev 15296) @@ -40,12 +40,6 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -59,12 +53,6 @@ <artifactId>jboss-servlet-api_3.0_spec</artifactId> <scope>provided</scope> </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build>