[seam-commits] Seam SVN: r14323 - in branches/community/Seam_2_3: examples/blog/blog-tests and 28 other directories.

Author: manaRH Date: 2012-02-17 14:52:18 -0500 (Fri, 17 Feb 2012) New Revision: 14323 Removed: branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml branches/community/Seam_2_3/examples/pom.xml branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml Log: JBSEAM-4896 changed maven-dependency-plugin Modified: branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -87,10 +87,6 @@ <directory>src/test/resources</directory> <filtering>true</filtering> </testResource> - <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> <testResource> <!-- this takes datasource blog-ds.xml --> <directory>${basedir}/../blog-ear/src/main/resources</directory> <filtering>true</filtering> @@ -98,11 +94,11 @@ <testResource> <!-- this takes treecache.xml --> <directory>${basedir}/../blog-ear/src/main/application</directory> <filtering>true</filtering> - </testResource> - <testResource> <!-- this takes themes aka *.properties --> - <directory>${basedir}/../blog-web/src/main/resources</directory> - <filtering>true</filtering> </testResource> + <testResource> <!-- this takes themes aka *.properties --> + <directory>${basedir}/../blog-web/src/main/resources</directory> + <filtering>true</filtering> + </testResource> </testResources> <plugins> <plugin> @@ -113,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../blog-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -130,6 +127,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -137,7 +135,6 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> @@ -149,12 +146,6 @@ <configuration> <filesets> <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - <fileset> <directory>${basedir}/blogindexes</directory> </fileset> </filesets> Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -101,6 +101,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../contactlist-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -118,6 +119,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -125,26 +127,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/META-INF</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -105,6 +105,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../drools-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -122,6 +123,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -129,26 +131,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -113,6 +113,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../dvdstore-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -130,6 +131,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -137,7 +139,6 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> @@ -149,12 +150,6 @@ <configuration> <filesets> <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - <fileset> <directory>${basedir}/dvdindexes</directory> </fileset> </filesets> Modified: branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -164,6 +164,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../excel-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -181,6 +182,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -188,26 +190,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -101,6 +101,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../guice-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -118,6 +119,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -125,26 +127,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/META-INF</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -99,6 +99,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../hibernate-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -134,6 +135,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -141,26 +143,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -88,10 +88,6 @@ <filtering>true</filtering> </testResource> <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> - <testResource> <directory>${basedir}/../icefaces-ear/src/main/resources</directory> <filtering>true</filtering> </testResource> @@ -105,6 +101,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../icefaces-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -122,6 +119,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -129,26 +127,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Deleted: branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -1,24 +0,0 @@ -<components xmlns="http://jboss.com/products/seam/components" - xmlns:pdf="http://jboss.com/products/seam/pdf" - xmlns:core="http://jboss.com/products/seam/core" - xmlns:framework="http://jboss.com/products/seam/framework" - xmlns:web="http://jboss.com/products/seam/web" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd - http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.3.xsd - http://jboss.com/products/seam/web /Users/orb/proj/jboss/seam/trunk/src/main/org/jboss/seam/web-2.3.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> - - <component name="org.jboss.seam.document.documentStore"> - <property name="useExtensions">true</property> - <property name="errorPage">/pdfMissing.seam</property> - </component> - - <pdf:key-store-config key-store="pdf.keystore" - key-store-password="storepass" - key-password="keypass" - key-alias="pdfKey" /> - - <core:init debug="true" jndi-pattern="#{ejbName}/local" /> -</components> Modified: branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -108,16 +108,6 @@ </dependencies> <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -126,7 +116,8 @@ <skipTests>false</skipTests> <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> - <additionalClasspathElement>${basedir}/../itext-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -144,6 +135,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -151,26 +143,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -93,10 +93,6 @@ <filtering>true</filtering> </testResource> <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> - <testResource> <directory>${basedir}/../jpa-web/src/main/resources</directory> <filtering>true</filtering> </testResource> @@ -110,6 +106,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../jpa-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -145,6 +142,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -152,26 +150,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -107,17 +107,16 @@ <directory>src/test/resources</directory> <filtering>true</filtering> </testResource> - <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> <testResource> <!-- this takes datasource mail-ds.xml --> <directory>${basedir}/../mail-ear/src/main/resources</directory> <filtering>true</filtering> </testResource> <testResource> <!-- this takes themes aka *.properties --> - <directory>${basedir}/../mail-web/src/main/resources</directory> + <directory>${basedir}/../mail-web/src/main/webapp</directory> <filtering>true</filtering> + <excludes> + <exclude>WEB-INF/components.xml</exclude> + </excludes> </testResource> </testResources> <plugins> @@ -128,7 +127,8 @@ <skipTests>false</skipTests> <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> - <additionalClasspathElement>${basedir}/../mail-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -146,6 +146,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -153,26 +154,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -101,6 +101,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../messages-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -118,6 +119,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -125,26 +127,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -108,7 +108,8 @@ <skipTests>false</skipTests> <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> - <additionalClasspathElement>${basedir}/../booking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -126,6 +127,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -133,26 +135,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -87,10 +87,6 @@ <directory>src/test/resources</directory> <filtering>true</filtering> </testResource> - <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> <testResource> <!-- this takes datasource dvdstore-ds.xml --> <directory>${basedir}/../dvdstore-ear/src/main/resources</directory> <filtering>true</filtering> @@ -113,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../dvdstore-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -130,6 +127,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -137,7 +135,6 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> @@ -149,12 +146,6 @@ <configuration> <filesets> <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - <fileset> <directory>${basedir}/dvdindexes</directory> </fileset> </filesets> Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -109,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -126,6 +127,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -133,26 +135,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -120,6 +120,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../numberguess-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -137,6 +138,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -144,26 +146,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -52,7 +52,8 @@ <module>tasks</module> <module>todo</module> <module>ui</module> - <module>wicket</module> +<!-- wicket example can't be compiled with java6 due bug in compiler?, only with java 5/7 + <module>wicket</module> --> <!-- <module>wiki</module> --> </modules> Modified: branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -113,6 +113,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../quartz-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -130,6 +131,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -137,26 +139,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -101,6 +101,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../registration-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -118,6 +119,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -125,26 +127,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/META-INF</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -142,6 +142,7 @@ <skipTests>false</skipTests> <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> <additionalClasspathElement>${basedir}/../restbay-web/src/main/webapp</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> @@ -160,6 +161,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -167,26 +169,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -112,6 +112,7 @@ <skipTests>false</skipTests> <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> <additionalClasspathElement>${basedir}/../seambay-web/src/main/webapp</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> @@ -128,8 +129,9 @@ <phase>process-resources</phase> <goals> <goal>unpack</goal> - </goals> + </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -137,26 +139,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -125,6 +125,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../seamdiscs-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -142,6 +143,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -149,26 +151,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -109,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../seampay-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -126,6 +127,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -133,26 +135,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -109,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../seamspace-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -126,6 +127,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -133,26 +135,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -139,6 +139,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../tasks-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -156,6 +157,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -163,26 +165,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -139,6 +139,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../todo-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -156,6 +157,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -163,26 +165,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -109,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../booking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -126,33 +127,20 @@ <goal>unpack</goal> </goals> <configuration> - <artifactItems> + <includes>bootstrap/**</includes> + <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> <artifactId>jboss-embedded-bootstrap</artifactId> <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> @@ -164,18 +152,6 @@ </properties> <build> <plugins> -<!-- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../booking-ear/src/main/resources/jboss-seam-booking-ds.xml</param> - <param>${basedir}/../booking-ear/target/seam-booking.ear</param> - </fileNames> - </configuration> - </plugin> --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -129,6 +129,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../mail-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -146,6 +147,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -153,26 +155,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323) @@ -101,6 +101,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../messages-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -118,6 +119,7 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> @@ -125,26 +127,12 @@ <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build>