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 2009/07/01 22:23:00 UTC
svn commit: r790359 - in /geronimo/external/trunk:
tomcat-parent-6.0.18/catalina/pom.xml tomcat-parent-6.0.20/catalina/pom.xml
Author: gawor
Date: Wed Jul 1 20:23:00 2009
New Revision: 790359
URL: http://svn.apache.org/viewvc?rev=790359&view=rev
Log:
fill-in ServerInfo properties - but I can't add that to archetype as ant task will fail
Modified:
geronimo/external/trunk/tomcat-parent-6.0.18/catalina/pom.xml
geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml
Modified: geronimo/external/trunk/tomcat-parent-6.0.18/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.18/catalina/pom.xml?rev=790359&r1=790358&r2=790359&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.18/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.18/catalina/pom.xml Wed Jul 1 20:23:00 2009
@@ -77,9 +77,39 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions></instructions>
+ <instructions>
+ <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>
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml?rev=790359&r1=790358&r2=790359&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml Wed Jul 1 20:23:00 2009
@@ -77,9 +77,39 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <instructions></instructions>
+ <instructions>
+ <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>