Return-Path: 
 <scm-return-37354-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 40877 invoked from network); 1 Jul 2009 20:23:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Jul 2009 20:23:12 -0000
Received: (qmail 2729 invoked by uid 500); 1 Jul 2009 20:23:23 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 2660 invoked by uid 500); 1 Jul 2009 20:23:23 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 2651 invoked by uid 99); 1 Jul 2009 20:23:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 20:23:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2009 20:23:21 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C19302388891; Wed,  1 Jul 2009 20:23:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r790359 - in /geronimo/external/trunk:
 tomcat-parent-6.0.18/catalina/pom.xml tomcat-parent-6.0.20/catalina/pom.xml
Date: Wed, 01 Jul 2009 20:23:00 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090701202300.C19302388891@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>