geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1329537 - in /geronimo/external/trunk/tomcat-parent-7.0.27: catalina/pom.xml catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties pom.xml
Date Tue, 24 Apr 2012 03:39:21 GMT
Author: xiaming
Date: Tue Apr 24 03:39:21 2012
New Revision: 1329537

URL: http://svn.apache.org/viewvc?rev=1329537&view=rev
Log:
GERONIMO-6334 Use java 6 profile, scm info, and update serverinfo.properties

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
    geronimo/external/trunk/tomcat-parent-7.0.27/pom.xml

Modified: geronimo/external/trunk/tomcat-parent-7.0.27/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/catalina/pom.xml?rev=1329537&r1=1329536&r2=1329537&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/catalina/pom.xml Tue Apr 24 03:39:21 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.27.1-SNAPSHOT"
/>
-                                    <replacefilter token="@VERSION_NUMBER@" value="7.0.27.1-SNAPSHOT"
/>
+                                    <replacefilter token="@VERSION@" value="7.0.27.1"
/>
+                                    <replacefilter token="@VERSION_NUMBER@" value="7.0.27.1"
/>
                                     <replacefilter token="@VERSION_BUILT@" value="${TODAY}
${TSTAMP}" />
                                 </replace>
                             </tasks>

Modified: geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties?rev=1329537&r1=1329536&r2=1329537&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
Tue Apr 24 03:39:21 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.27/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/pom.xml?rev=1329537&r1=1329536&r2=1329537&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/pom.xml Tue Apr 24 03:39:21 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.27/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-parent-7.0.27/</developerConnection>
+        <url>http://svn.apache.org/viewcvs/geronimo/external/trunk/tomcat-parent-7.0.27/</url>
     </scm>
 
     <dependencyManagement>



Mime
View raw message