You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/01/13 04:41:28 UTC
svn commit: r1230885 - in /geronimo/external/trunk/tomcat-parent-7.0.23:
catalina/pom.xml
catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
pom.xml
Author: xiaming
Date: Fri Jan 13 03:41:28 2012
New Revision: 1230885
URL: http://svn.apache.org/viewvc?rev=1230885&view=rev
Log:
GERONIMO-6262 1. Use java6 profile; 2. Update serverinfo.properties to reflect geronimo redistribution info
Modified:
geronimo/external/trunk/tomcat-parent-7.0.23/catalina/pom.xml
geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
geronimo/external/trunk/tomcat-parent-7.0.23/pom.xml
Modified: geronimo/external/trunk/tomcat-parent-7.0.23/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.23/catalina/pom.xml?rev=1230885&r1=1230884&r2=1230885&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.23/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.23/catalina/pom.xml Fri Jan 13 03:41:28 2012
@@ -96,8 +96,8 @@
<format property="TSTAMP" pattern="hh:mm:ss" />
</tstamp>
<replace file="target/classes/org/apache/catalina/util/ServerInfo.properties">
- <replacefilter token="@VERSION@" value="7.0.23.1-SNAPSHOT" />
- <replacefilter token="@VERSION_NUMBER@" value="7.0.23.1-SNAPSHOT" />
+ <replacefilter token="@VERSION@" value="7.0.23.1" />
+ <replacefilter token="@VERSION_NUMBER@" value="7.0.23.1" />
<replacefilter token="@VERSION_BUILT@" value="${TODAY} ${TSTAMP}" />
</replace>
</tasks>
Modified: geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties?rev=1230885&r1=1230884&r2=1230885&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.23/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties Fri Jan 13 03:41:28 2012
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-server.info=Apache Tomcat/@VERSION@
+server.info=Apache Geronimo(Embedded Tomcat @VERSION@)
server.number=@VERSION_NUMBER@
-server.built=@VERSION_BUILT@
\ No newline at end of file
+server.built=@VERSION_BUILT@
Modified: geronimo/external/trunk/tomcat-parent-7.0.23/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.23/pom.xml?rev=1230885&r1=1230884&r2=1230885&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.23/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.23/pom.xml Fri Jan 13 03:41:28 2012
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>genesis-java5-flava</artifactId>
+ <artifactId>genesis-java6-flava</artifactId>
<version>2.0</version>
</parent>
@@ -43,9 +43,9 @@ mvn archetype:generate -DarchetypeCatalo
-->
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/external/branches/tomcat-archetype-7.0.x/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/branches/tomcat-archetype-7.0.x/</developerConnection>
- <url>http://svn.apache.org/viewcvs/geronimo/external/branches/tomcat-archetype-7.0.x/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-parent-7.0.23/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-parent-7.0.23/</developerConnection>
+ <url>http://svn.apache.org/viewcvs/geronimo/external/trunk/tomcat-parent-7.0.23/</url>
</scm>
<dependencyManagement>