Author: veithen Date: Sat Dec 13 15:15:20 2008 New Revision: 726288 URL: http://svn.apache.org/viewvc?rev=726288&view=rev Log: Include legal files (LICENSE.txt and NOTICE.txt) by copying them using the antrun plugin. This allows the Maven Eclipse plugin to work correctly (Eclipse doesn't like "../.." as source folder). Also added the legal files to the C14N module.
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=726288&r1=726287&r2=726288&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Sat Dec 13 15:15:20 2008 @@ -65,15 +65,33 @@ <directory>src/main/resources</directory> </resource> <resource> - <directory>../..</directory> - <includes> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - </includes> + <directory>${project.build.directory}/legal-files</directory> </resource> </resources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-legal-files</id> + <phase>generate-resources</phase> + <configuration> + <tasks> + <copy todir="${project.build.directory}/legal-files"> + <fileset dir="../.."> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> Modified: webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml?rev=726288&r1=726287&r2=726288&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-c14n/pom.xml Sat Dec 13 15:15:20 2008 @@ -47,8 +47,38 @@ </dependency> </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/legal-files</directory> + </resource> + </resources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-legal-files</id> + <phase>generate-resources</phase> + <configuration> + <tasks> + <copy todir="${project.build.directory}/legal-files"> + <fileset dir="../.."> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <includes> Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=726288&r1=726287&r2=726288&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Sat Dec 13 15:15:20 2008 @@ -62,15 +62,33 @@ <directory>src/main/resources</directory> </resource> <resource> - <directory>../..</directory> - <includes> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - </includes> + <directory>${project.build.directory}/legal-files</directory> </resource> </resources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-legal-files</id> + <phase>generate-resources</phase> + <configuration> + <tasks> + <copy todir="${project.build.directory}/legal-files"> + <fileset dir="../.."> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=726288&r1=726287&r2=726288&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Sat Dec 13 15:15:20 2008 @@ -66,15 +66,33 @@ <directory>src/main/resources</directory> </resource> <resource> - <directory>../..</directory> - <includes> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - </includes> + <directory>${project.build.directory}/legal-files</directory> </resource> </resources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-legal-files</id> + <phase>generate-resources</phase> + <configuration> + <tasks> + <copy todir="${project.build.directory}/legal-files"> + <fileset dir="../.."> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive>