You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/28 04:26:59 UTC
svn commit: r589265 - in /geronimo/samples/trunk/samples:
jaxws-calculator/jaxws-calculator-war/pom.xml
jsp-examples/jsp-examples-war/pom.xml pom.xml
servlet-examples/servlet-examples-war/pom.xml
Author: gawor
Date: Sat Oct 27 20:26:58 2007
New Revision: 589265
URL: http://svn.apache.org/viewvc?rev=589265&view=rev
Log:
check for legal files
Modified:
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
geronimo/samples/trunk/samples/pom.xml
geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml
Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=589265&r1=589264&r2=589265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Sat Oct 27 20:26:58 2007
@@ -71,7 +71,7 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.wsdl, **/*.xsd, **/*.jsp, **/*.xml, **/*.class, **/*.html</warSourceIncludes>
+ <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.wsdl, **/*.xsd, **/*.jsp, **/*.xml, **/*.class, **/*.html, META-INF/*</warSourceIncludes>
<archiveClasses>true</archiveClasses>
<archive>
<manifest>
Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml?rev=589265&r1=589264&r2=589265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml Sat Oct 27 20:26:58 2007
@@ -33,16 +33,4 @@
<name>Geronimo Samples :: JSP Examples WAR</name>
<packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=589265&r1=589264&r2=589265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Sat Oct 27 20:26:58 2007
@@ -88,9 +88,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <!--
- <archiveClasses>true</archiveClasses>
- -->
+ <archiveClasses>true</archiveClasses>
<archive>
<!-- Do not include META-INF/maven to avoid long file problems on windows -->
<addMavenDescriptor>false</addMavenDescriptor>
@@ -129,6 +127,42 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+
+ <executions>
+ <execution>
+ <id>install-legal-files</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if no legal files were copied -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if no legal files were found -->
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<reporting>
@@ -159,12 +193,9 @@
<links>
<!-- JSE -->
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://java.sun.com/j2se/1.3/docs/api/</link>
<!-- JEE -->
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
<!-- Libraries -->
<link>http://jakarta.apache.org/commons/collections/apidocs</link>
Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml?rev=589265&r1=589264&r2=589265&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-war/pom.xml Sat Oct 27 20:26:58 2007
@@ -33,18 +33,4 @@
<name>Geronimo Samples :: Servlet Examples WAR</name>
<packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- <archiveClasses>true</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>