geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r486426 - /geronimo/server/branches/1.2/pom.xml
Date Wed, 13 Dec 2006 00:23:59 GMT
Author: jdillon
Date: Tue Dec 12 16:23:59 2006
New Revision: 486426

URL: http://svn.apache.org/viewvc?view=rev&rev=486426
Log:
Added hack to include legal files directly into wars

Modified:
    geronimo/server/branches/1.2/pom.xml

Modified: geronimo/server/branches/1.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/pom.xml?view=diff&rev=486426&r1=486425&r2=486426
==============================================================================
--- geronimo/server/branches/1.2/pom.xml (original)
+++ geronimo/server/branches/1.2/pom.xml Tue Dec 12 16:23:59 2006
@@ -1038,6 +1038,23 @@
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
                             <addMavenDescriptor>false</addMavenDescriptor>
                         </archive>
+                        
+                        <!--
+                        HACK: Include legal files explicity, otherwise they will end up in
the wrong path
+                              or in another jar file in the war.
+                        
+                        NOTE: targetPath is broken for webResources (as documented)
+                        -->
+                        <webResources>
+                            <resource>
+                                <directory>${pom.basedir}/target/classes</directory>
+                                <includes>
+                                    <include>META-INF/LICENSE*</include>
+                                    <include>META-INF/NOTICE*</include>
+                                    <include>META-INF/DISCLAIMER*</include>
+                                </includes>
+                            </resource>
+                        </webResources>
                     </configuration>
                 </plugin>
 
@@ -1145,13 +1162,6 @@
                         </configuration>
                     </execution>
 
-                    <!--
-                    NOTE: This will copy LICENSE.txt and NOTICE.txt to classes/META-INF.
-
-                          Its a itty-bitty HACK to avoid adding resource definitions to
-                          the build, which causes the Eclipse plugin to generate invalid
-                          .classpath files. :-(
-                    -->
                     <execution>
                         <id>install-legal-files</id>
                         <phase>generate-resources</phase>



Mime
View raw message