You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/04/27 08:52:18 UTC
svn commit: r938331 - in /geronimo/external/trunk/tomcat-parent-7.0.0:
catalina/pom.xml jasper/pom.xml
Author: xuhaihong
Date: Tue Apr 27 06:52:17 2010
New Revision: 938331
URL: http://svn.apache.org/viewvc?rev=938331&view=rev
Log:
Not sure why those configurations are missed while copying them from tomcat-archetype...
Modified:
geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml?rev=938331&r1=938330&r2=938331&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml Tue Apr 27 06:52:17 2010
@@ -74,11 +74,39 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>javax.servlet.resources,javax.servlet.jsp.resources,*</Import-Package>
+ <Import-Package>javax.servlet.resources,javax.servlet.jsp.resources,!org.apache.juli,*</Import-Package>
+ <Include-Resource>
+ {maven-resources},
+ org/apache/catalina/util/ServerInfo.properties=target/classes/org/apache/catalina/util/ServerInfo.properties
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+ <format property="TSTAMP" pattern="hh:mm:ss"/>
+ </tstamp>
+ <replace file="target/classes/org/apache/catalina/util/ServerInfo.properties">
+ <replacefilter token="@VERSION@" value="${version}"/>
+ <replacefilter token="@VERSION_NUMBER@" value="${version}"/>
+ <replacefilter token="@VERSION_BUILT@" value="${TODAY} ${TSTAMP}"/>
+ </replace>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
-
+ </build>
</project>
Modified: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml?rev=938331&r1=938330&r2=938331&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml Tue Apr 27 06:52:17 2010
@@ -81,7 +81,9 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions></instructions>
+ <instructions>
+ <Import-Package>javax.servlet.resources,javax.servlet.jsp.resources,*</Import-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>