[richfaces-svn-commits] JBoss Rich Faces SVN: r13788 - in trunk/test-applications/regressionArea: regressionArea-ejb/src/main/resources/META-INF and 2 other directories.

Author: nbelaevski Date: 2009-04-23 06:38:52 -0400 (Thu, 23 Apr 2009) New Revision: 13788 Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF trunk/test-applications/regressionArea/regressionArea-web/pom.xml trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/RF-6894 Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-23 10:10:17 UTC (rev 13787) +++ trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-23 10:38:52 UTC (rev 13788) @@ -139,7 +139,7 @@ <zipUrlInstaller> <url>${jboss.installer.url}</url> <installDir> - ${project.basedir}/target/installs + ${jboss.install.dir} </installDir> </zipUrlInstaller> </container> @@ -167,8 +167,9 @@ </build> <properties> + <jboss.install.dir>${project.basedir}/target/installs</jboss.install.dir> <jboss.version>4.2.3.GA</jboss.version> - <jbosshome>${project.basedir}/target/installs/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome> + <jbosshome>${jboss.install.dir}/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome> <jboss.installer.url>file:F:\Distribs\jboss-${jboss.version}.zip</jboss.installer.url> </properties> Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:10:17 UTC (rev 13787) +++ trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:38:52 UTC (rev 13788) @@ -1,10 +1,6 @@ Manifest-Version: 1.0 Class-Path: bsh-1.3.0.jar commons-beanutils-1.7.0.jar commons-collecti - ons-3.2.jar commons-digester-2.0.jar commons-lang-2.3.jar commons-log - ging-1.0.4.jar dom4j-1.6.1-brew.jar el-api-1.0.jar jboss-el-1.0_02.CR - 2.jar jboss-seam-2.1.1.GA.jar jboss-seam-debug-2.1.1.GA.jar jboss-sea - m-jul-2.1.1.GA.jar jboss-seam-remoting-2.1.1.GA.jar jboss-seam-ui-2.1 - .1.GA.jar jsf-api-1.2_11.jar jsf-facelets-1.1.15.B1.jar jsf-impl-1.2_ - 11.jar log4j-1.2.14.jar richfaces-api-3.3.1-SNAPSHOT.jar richfaces-im - pl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar + ons-3.2.jar commons-lang-2.3.jar commons-logging-1.0.4.jar el-api-1.0 + .jar jboss-el-1.0_02.CR2.jar jboss-seam-2.1.1.GA.jar log4j-1.2.14.jar + richfaces-api-3.3.1-SNAPSHOT.jar Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-23 10:10:17 UTC (rev 13787) +++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-23 10:38:52 UTC (rev 13788) @@ -22,6 +22,16 @@ <artifactId>jboss-seam</artifactId> <version>${seamversion}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> @@ -67,6 +77,14 @@ <artifactId>jboss-seam</artifactId> <groupId>org.jboss.seam</groupId> </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> </exclusions> </dependency> <dependency> Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:10:17 UTC (rev 13787) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:38:52 UTC (rev 13788) @@ -1,4 +1,6 @@ Manifest-Version: 1.0 -Class-Path: commons-digester-2.0.jar jsf-facelets-1.1.14.jar richfaces - -impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar +Class-Path: commons-beanutils-1.7.0.jar commons-digester-2.0.jar jboss + -seam-debug-2.1.1.GA.jar jboss-seam-jul-2.1.1.GA.jar jboss-seam-remot + ing-2.1.1.GA.jar jboss-seam-ui-2.1.1.GA.jar jsf-facelets-1.1.15.B1.ja + r richfaces-impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar