Author: kkolinko
Date: Sun Jan 26 21:56:50 2014
New Revision: 1561552
URL: http://svn.apache.org/r1561552
Log:
Merged revisions r1561067-r1561070 from tomcat/trunk:
Remove $Id keyword from res/**
Remove svn:keywords property from res/**
svn propdel svn:keywords --depth infinity
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/INSTALLLICENSE (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/annotations-api.jar.manifest (props
changed)
tomcat/tc7.0.x/trunk/res/META-INF/bootstrap.jar.manifest (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/default.manifest (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/el-api.jar.manifest (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.license (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.manifest (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.notice (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.license (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.manifest (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice (props changed)
tomcat/tc7.0.x/trunk/res/confinstall/tomcat-users_1.xml (props changed)
tomcat/tc7.0.x/trunk/res/confinstall/tomcat-users_2.xml (props changed)
tomcat/tc7.0.x/trunk/res/deployer/build.xml (props changed)
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (props
changed)
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.project (props
changed)
tomcat/tc7.0.x/trunk/res/maven/README.txt (contents, props changed)
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom (props
changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom (props
changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom (props
changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom (props changed)
tomcat/tc7.0.x/trunk/res/scripts/check-mime.pl (contents, props changed)
tomcat/tc7.0.x/trunk/res/tomcat.nsi (contents, props changed)
tomcat/tc7.0.x/trunk/res/welcome.bin.html (props changed)
tomcat/tc7.0.x/trunk/res/welcome.main.html (props changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561067-1561070
Propchange: tomcat/tc7.0.x/trunk/res/INSTALLLICENSE
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/annotations-api.jar.manifest
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/bootstrap.jar.manifest
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/default.manifest
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/el-api.jar.manifest
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.license
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.manifest
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/jsp-api.jar.notice
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.license
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.manifest
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/confinstall/tomcat-users_1.xml
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/confinstall/tomcat-users_2.xml
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/deployer/build.xml
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.project
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/res/maven/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/README.txt?rev=1561552&r1=1561551&r2=1561552&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/README.txt (original)
+++ tomcat/tc7.0.x/trunk/res/maven/README.txt Sun Jan 26 21:56:50 2014
@@ -15,8 +15,6 @@
limitations under the License.
================================================================================
-$Id$
-
General preparations before any publishing:
1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place it in
this directory
Propchange: tomcat/tc7.0.x/trunk/res/maven/README.txt
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/res/scripts/check-mime.pl
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/scripts/check-mime.pl?rev=1561552&r1=1561551&r2=1561552&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/scripts/check-mime.pl (original)
+++ tomcat/tc7.0.x/trunk/res/scripts/check-mime.pl Sun Jan 26 21:56:50 2014
@@ -18,8 +18,6 @@
# -----------------------------------------------------------------------------
# Merge the MIME type definitions contained in the
# file mime.types from the httpd project into Tomcat web.xml.
-#
-# $Id$
# -----------------------------------------------------------------------------
# The script uses two mime type lists to describe
Propchange: tomcat/tc7.0.x/trunk/res/scripts/check-mime.pl
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1561552&r1=1561551&r2=1561552&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Sun Jan 26 21:56:50 2014
@@ -14,7 +14,6 @@
; limitations under the License.
; Tomcat script for Nullsoft Installer
-; $Id$
;Compression options
CRCCheck on
Propchange: tomcat/tc7.0.x/trunk/res/tomcat.nsi
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/welcome.bin.html
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/res/welcome.main.html
('svn:keywords' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
