Author: mvitenkov Date: 2009-08-12 10:24:45 -0400 (Wed, 12 Aug 2009) New Revision: 15158 Modified: branches/community/3.3.X/test-applications/seamApp/ear/pom.xml branches/community/3.3.X/test-applications/seamApp/pom.xml branches/community/3.3.X/test-applications/seamApp/web/pom.xml branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/pages/Rich/Rich.xhtml Log: add jboss 5.1.0.GA support Modified: branches/community/3.3.X/test-applications/seamApp/ear/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/ear/pom.xml 2009-08-12 13:35:00 UTC (rev 15157) +++ branches/community/3.3.X/test-applications/seamApp/ear/pom.xml 2009-08-12 14:24:45 UTC (rev 15158) @@ -40,7 +40,7 @@ <groupId>javax.el</groupId> </exclusion> <exclusion> - <groupId>org.jboss.seam</groupId> + <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> </exclusion> <exclusion> @@ -118,16 +118,10 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.seam</groupId> + <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> - <version>2.0.0.GA</version> - <exclusions> - <exclusion> - <artifactId>el-api</artifactId> - <groupId>javax.el</groupId> - </exclusion> - </exclusions> - </dependency> + <version>2.0.2.CR1</version> + </dependency> </dependencies> <build> <finalName>${projectName}-ear-1.0-SNAPSHOT</finalName> Modified: branches/community/3.3.X/test-applications/seamApp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/pom.xml 2009-08-12 13:35:00 UTC (rev 15157) +++ branches/community/3.3.X/test-applications/seamApp/pom.xml 2009-08-12 14:24:45 UTC (rev 15158) @@ -13,7 +13,7 @@ <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA... <jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir> <droolsVersion>4.0.0</droolsVersion> - <faceletsVersion>1.1.14</faceletsVersion> + <faceletsVersion>1.1.15.B1</faceletsVersion> <installDir>E:/apps/jboss</installDir> </properties> <repositories> Modified: branches/community/3.3.X/test-applications/seamApp/web/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/web/pom.xml 2009-08-12 13:35:00 UTC (rev 15157) +++ branches/community/3.3.X/test-applications/seamApp/web/pom.xml 2009-08-12 14:24:45 UTC (rev 15158) @@ -29,36 +29,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <version>${seamVersion}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-el</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-pdf</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.persistence</groupId> @@ -96,7 +67,7 @@ <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>1.1.14</version> + <version>1.1.15.B1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -125,12 +96,22 @@ <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> <version>${seamVersion}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> Modified: branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/pages/Rich/Rich.xhtml 2009-08-12 13:35:00 UTC (rev 15157) +++ branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/pages/Rich/Rich.xhtml 2009-08-12 14:24:45 UTC (rev 15158) @@ -43,15 +43,15 @@ <h:panelGrid id="richGridID" columns="1" width="100%"> <h:panelGroup rendered="#{option.reComponent}"> - <ui:include src="#{richBean.pathComponent}"/> + <ui:include src="${richBean.pathComponent}"/> </h:panelGroup> <h:panelGroup rendered="#{option.reStraightforward}"> - <ui:include src="#{richBean.pathStraightforward}" /> + <ui:include src="${richBean.pathStraightforward}" /> </h:panelGroup> <h:panelGroup rendered="#{option.reProperty}"> - <ui:include src="#{richBean.pathProperty}" /> + <ui:include src="${richBean.pathProperty}" /> </h:panelGroup> <a4j:log popup="false" rendered="#{option.log}"></a4j:log> </h:panelGrid>