[Tomcat Wiki] Update of "Помощ ьНовичкам" by Il yas Bakirov

2010-01-02 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "ПомощьНовичкам" page has been changed by Ilyas Bakirov.
http://wiki.apache.org/tomcat/%D0%9F%D0%BE%D0%BC%D0%BE%D1%89%D1%8C%D0%9D%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0%D0%BC

--

New page:
= Hide/disable Apache Tomcat server version =

Sometimes for security reasons system administrators hide/disable server 
informations such as web server product name and version. Unlike famous Apache 
HTTP server Apache Tomcat does not have applicable configuration keys for this, 
but we can change/remove version information in ServerInfo.properties file 
which is located in catalina.jar file.

Steps:
 * Stop Apache Tomcat server
 * Unpack '''$CATALINA_HOME$/lib/catalina.jar''' or 
'''$CATALINA_HOME$/server/lib/catalina.jar''' (''jar xvf catalina.jar 
org/apache/catalina/util/ServerInfo.properties'')
 * Update '''ServerInfo.properties''' text file. You will see '''server.name''' 
and '''server.number''' keys
 * Pack only '''ServerInfo.properties''' file again into catalina.jar (''jar 
uvf catalina.jar org/apache/catalina/util/ServerInfo.properties'' Be sure not 
to include org/apache/catalina/util folder structure again)
 * Start Apache Tomcat server


 

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of "Помощ ьНовичкам" by Il yas Bakirov

2010-01-02 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "ПомощьНовичкам" page has been changed by Ilyas Bakirov.
The comment on this change is: sorry but I could not add new wiki page in 
HelpForAdministrators section, pls move to appropriate wiki section.
http://wiki.apache.org/tomcat/%D0%9F%D0%BE%D0%BC%D0%BE%D1%89%D1%8C%D0%9D%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0%D0%BC?action=diff&rev1=1&rev2=2

--

  
  
   
+ (sorry but I could not add new wiki page in HelpForAdministrators section, 
pls move to appropriate wiki section)
  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895180 - in /tomcat/jk/trunk: native/NOTICE native/common/jk_status.c native/iis/jk_isapi_plugin.c xdocs/style.xsl

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 12:15:57 2010
New Revision: 895180

URL: http://svn.apache.org/viewvc?rev=895180&view=rev
Log:
Happy new year!
Update Copyright year for JK.

Modified:
tomcat/jk/trunk/native/NOTICE
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/style.xsl

Modified: tomcat/jk/trunk/native/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/NOTICE?rev=895180&r1=895179&r2=895180&view=diff
==
--- tomcat/jk/trunk/native/NOTICE (original)
+++ tomcat/jk/trunk/native/NOTICE Sat Jan  2 12:15:57 2010
@@ -1,5 +1,5 @@
 Apache Tomcat Connectors
-Copyright 2002-2009 The Apache Software Foundation
+Copyright 2002-2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/jk/trunk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=895180&r1=895179&r2=895180&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Sat Jan  2 12:15:57 2010
@@ -215,7 +215,7 @@
"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\" lang=\"en\">" \
"JK Status 
Manager"
 
-#define JK_STATUS_COPYRIGHT"Copyright © 1999-2009, The 
Apache Software Foundation" \
+#define JK_STATUS_COPYRIGHT"Copyright © 1999-2010, The 
Apache Software Foundation" \
"Licensed under the http://www.apache.org/licenses/LICENSE-2.0\";>" \
"Apache License, Version 2.0."
 

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=895180&r1=895179&r2=895180&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sat Jan  2 12:15:57 2010
@@ -209,7 +209,7 @@
 " \n"
 "\n"
 "\n"
-"Copyright © 1999-2009 Apache Software 
Foundation\n"
+"Copyright © 1999-2010 Apache Software 
Foundation\n"
 "All Rights Reserved\n"
 "\n\n\n";
 

Modified: tomcat/jk/trunk/xdocs/style.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/style.xsl?rev=895180&r1=895179&r2=895180&view=diff
==
--- tomcat/jk/trunk/xdocs/style.xsl (original)
+++ tomcat/jk/trunk/xdocs/style.xsl Sat Jan  2 12:15:57 2010
@@ -178,7 +178,7 @@
   PAGE FOOTER
   
 
-Copyright © 1999-2009, Apache Software Foundation
+Copyright © 1999-2010, Apache Software Foundation
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Page ПомощьНов ичкам deleted from Tomcat Wiki

2010-01-02 Thread Apache Wiki 
Dear wiki user,

You have subscribed to a wiki page "Tomcat Wiki" for change notification.

The page "ПомощьНовичкам" has been deleted by markt.
The comment on this change is: Remove inaccurrate information. Configuration 
options are available..
http://wiki.apache.org/tomcat/%D0%9F%D0%BE%D0%BC%D0%BE%D1%89%D1%8C%D0%9D%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0%D0%BC

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Remove non-English languages from Tomcat wiki

2010-01-02 Thread Konstantin Kolinko 
There is a problem in the Tomcat wiki configuration, that
http://wiki.apache.org/tomcat/  appears effectively empty if your
browser is configured to prefer content in a non-English language.

Here is INFRA issue on this problem:
https://issues.apache.org/jira/browse/INFRA-2251

I added my comment there. In essence, my proposal is to remove support
for other languages besides English, for the reasons that other people
and I mentioned there.

Any comments?

Lately it resulted in someone inadvertently vandalizing the
"HelpForBeginners" page of the Russian wiki. -- already reverted by
Mark.


Eh.. Happy New Year, everyone!

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895189 - in /tomcat/trunk/modules/tomcat-lite/java/org/apache: coyote/servlet/FilterChainImpl.java tomcat/lite/servlet/FilterChainImpl.java

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 13:26:32 2010
New Revision: 895189

URL: http://svn.apache.org/viewvc?rev=895189&view=rev
Log:
Change license header in two tomcat-lite java source files
using the copy2license.pl script.

Although the previous form is what the license file states how to
correctly apply ASL 2.0, usually the ASF copyright notice is not
applied to every source file. See

   http://www.apache.org/legal/src-headers.html#headers

for details.

Modified:

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/FilterChainImpl.java

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java?rev=895189&r1=895188&r2=895189&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterChainImpl.java
 Sat Jan  2 13:26:32 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *  http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/FilterChainImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/FilterChainImpl.java?rev=895189&r1=895188&r2=895189&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/FilterChainImpl.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/FilterChainImpl.java
 Sat Jan  2 13:26:32 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 2009 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *  http://www.apache.org/licenses/LICENSE-2.0
  * 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895191 - in /tomcat/trunk/bin: catalina.bat service.bat shutdown.bat startup.bat version.bat

2010-01-02 Thread kkolinko 
Author: kkolinko
Date: Sat Jan  2 13:47:10 2010
New Revision: 895191

URL: http://svn.apache.org/viewvc?rev=895191&view=rev
Log:
Fix calling Tomcat Windows scripts from a directory containg spaces,
as noted in https://issues.apache.org/bugzilla/show_bug.cgi?id=48464#c4 by 
LiuYan

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/service.bat
tomcat/trunk/bin/shutdown.bat
tomcat/trunk/bin/startup.bat
tomcat/trunk/bin/version.bat

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=895191&r1=895190&r2=895191&view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Sat Jan  2 13:47:10 2010
@@ -80,7 +80,7 @@
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 cd ..
 set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+cd "%CURRENT_DIR%"
 :gotHome
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 echo The CATALINA_HOME environment variable is not defined correctly

Modified: tomcat/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=895191&r1=895190&r2=895191&view=diff
==
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Sat Jan  2 13:47:10 2010
@@ -144,4 +144,4 @@
 echo The service '%SERVICE_NAME%' has been installed.
 
 :end
-cd %CURRENT_DIR%
+cd "%CURRENT_DIR%"

Modified: tomcat/trunk/bin/shutdown.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.bat?rev=895191&r1=895190&r2=895191&view=diff
==
--- tomcat/trunk/bin/shutdown.bat (original)
+++ tomcat/trunk/bin/shutdown.bat Sat Jan  2 13:47:10 2010
@@ -28,7 +28,7 @@
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 cd ..
 set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+cd "%CURRENT_DIR%"
 :gotHome
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 echo The CATALINA_HOME environment variable is not defined correctly

Modified: tomcat/trunk/bin/startup.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.bat?rev=895191&r1=895190&r2=895191&view=diff
==
--- tomcat/trunk/bin/startup.bat (original)
+++ tomcat/trunk/bin/startup.bat Sat Jan  2 13:47:10 2010
@@ -28,7 +28,7 @@
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 cd ..
 set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+cd "%CURRENT_DIR%"
 :gotHome
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 echo The CATALINA_HOME environment variable is not defined correctly

Modified: tomcat/trunk/bin/version.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/version.bat?rev=895191&r1=895190&r2=895191&view=diff
==
--- tomcat/trunk/bin/version.bat (original)
+++ tomcat/trunk/bin/version.bat Sat Jan  2 13:47:10 2010
@@ -28,7 +28,7 @@
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 cd ..
 set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+cd "%CURRENT_DIR%"
 :gotHome
 if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
 echo The CATALINA_HOME environment variable is not defined correctly



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895199 - in /tomcat/trunk/modules/tomcat-lite: java/org/apache/coyote/servlet/ java/org/apache/tomcat/lite/service/ java/org/apache/tomcat/lite/servlet/ java/org/apache/tomcat/servlets/fi

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 14:08:45 2010
New Revision: 895199

URL: http://svn.apache.org/viewvc?rev=895199&view=rev
Log:
Change license header in tomcat-lite java source files
using the copy2license.pl script.

Although the previous form is what the license file states how to
correctly apply ASL 2.0, usually the ASF copyright notice is not
applied to every source file. See

   http://www.apache.org/legal/src-headers.html#headers

for details.

Modified:

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/JspLoader.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/Locale2Charset.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ParameterMap.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletConfigImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletInputStreamImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletOutputStreamImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletReaderImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletRequestWrapperImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletResponseIncludeWrapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/ServletWriterImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappFilterMapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/WebappServletMapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/service/LogConfig.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/FilterConfigImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/Locale2Charset.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletConfigImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletInputStreamImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletOutputStreamImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletReaderImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletRequestImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletRequestWrapperImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletResponseIncludeWrapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/ServletWriterImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/servlet/WebappFilterMapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/DefaultServlet.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/MD5Encoder.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/URLEncoder.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/file/XMLWriter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/AccessFilter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/IPFilter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/sec/SimpleUserAuthDB.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/HttpSessionImpl.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/session/SimpleSessionManager.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/LocaleParser.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/RequestUtil.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/servlets/util/URLEncoder.java

tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java

Modified: 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java?rev=895199&r1=895198&r2=895199&view=diff
==
--- 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java
 (original)
+++ 
tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/servlet/FilterConfigImpl.java
 Sat Jan  2 14:08:45 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to

svn commit: r895202 - in /tomcat/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ modules/jdbc-pool/ modules/jdbc-pool/doc/ res/ res/META-INF/ webapps/ROOT/ webapps/d

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 14:22:50 2010
New Revision: 895202

URL: http://svn.apache.org/viewvc?rev=895202&view=rev
Log:
Update copyright year for TC trunk.

Modified:
tomcat/trunk/NOTICE
tomcat/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/trunk/modules/jdbc-pool/NOTICE
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/doc/package.xsl
tomcat/trunk/res/META-INF/jasper-jdt.jar.notice
tomcat/trunk/res/META-INF/jsp-api.jar.notice
tomcat/trunk/res/META-INF/servlet-api.jar.notice
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/ROOT/index.html
tomcat/trunk/webapps/docs/tomcat-docs.xsl
tomcat/trunk/webapps/docs/tribes/tomcat-docs.xsl
tomcat/trunk/webapps/manager/sessionDetail.jsp
tomcat/trunk/webapps/manager/sessionsList.jsp

Modified: tomcat/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=895202&r1=895201&r2=895202&view=diff
==
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Sat Jan  2 14:22:50 2010
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2009 The Apache Software Foundation
+Copyright 1999-2010 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=895202&r1=895201&r2=895202&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Sat Jan  2 
14:22:50 2010
@@ -188,7 +188,7 @@
 public static final String HTML_TAIL_SECTION =
 "\n" +
 "\n" +
-" Copyright © 1999-2009, Apache Software Foundation" +
+" Copyright © 1999-2010, Apache Software Foundation" +
 "\n" +
 "\n" +
 "\n" +

Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=895202&r1=895201&r2=895202&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sat 
Jan  2 14:22:50 2010
@@ -755,7 +755,7 @@
  */
 @Override
 public String getServletInfo() {
-return "HTMLManagerServlet, Copyright (c) The Apache Software 
Foundation";
+return "HTMLManagerServlet, Copyright (c) 1999-2010, The Apache 
Software Foundation";
 }   
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=895202&r1=895201&r2=895202&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java Sat Jan  
2 14:22:50 2010
@@ -191,7 +191,7 @@
 public static final String HTML_TAIL_SECTION =
 "\n" +
 "\n" +
-" Copyright © 1999-2009, Apache Software Foundation" +
+" Copyright © 1999-2010, Apache Software Foundation" +
 "\n" +
 "\n" +
 "\n" +

Modified: tomcat/trunk/modules/jdbc-pool/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/NOTICE?rev=895202&r1=895201&r2=895202&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/NOTICE (original)
+++ tomcat/trunk/modules/jdbc-pool/NOTICE Sat Jan  2 14:22:50 2010
@@ -1,5 +1,5 @@
 Apache Tomcat JDBC Pool
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=895202&r1=895201&r2=895202&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Sat Jan  2 14:22:50 2010
@@ -29,7 +29,7 @@
 
   
   
-  
+  
 
   
   

Modified: tomcat/trunk/modules/jdbc-pool/doc/package.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/package.xsl?rev=895202&r1=895201&r2=895202&view=diff
===

svn commit: r895203 - in /tomcat/trunk: build.xml dist.xml

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 14:24:51 2010
New Revision: 895203

URL: http://svn.apache.org/viewvc?rev=895203&view=rev
Log:
Allow to patch the current year via our
ant version strings filter.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/dist.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=895203&r1=895202&r2=895203&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Jan  2 14:24:51 2010
@@ -120,6 +120,7 @@
 
   
   
+
 
 
 

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=895203&r1=895202&r2=895203&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Sat Jan  2 14:24:51 2010
@@ -71,6 +71,7 @@
 
   
   
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895204 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default build.xml doc/changelog.xml doc/jdbc-pool.xml resources/MANIFEST.MF

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 15:22:41 2010
New Revision: 895204

URL: http://svn.apache.org/viewvc?rev=895204&view=rev
Log:
Borrow a few things from the main Tomcat build.xml:
- use general version filter
- automatically set year to the current year
- use patch version property without dot.
  The dot is added when combining it into a version number

I don't know whether the double '@' are intended for the
ant replacement markers in MANIFEST.MF (the outer ones remain
after ant filtering), but that is unchanged from the previous
behaviour.

Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=895204&r1=895203&r2=895204&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Sat Jan  2 15:22:41 
2010
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=0
 version.build=8
-version.patch=.3
+version.patch=3
 version.suffix=
 
 # - Default Base Path for Dependent Packages -

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=895204&r1=895203&r2=895204&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Sat Jan  2 15:22:41 2010
@@ -21,15 +21,26 @@
 
   
 
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
-  
+  
+  
 
   
   
-  
+  
+
+  
 
   
   
@@ -65,11 +76,24 @@
 
   
   
+  
+  
+
+
+  
+  
+
+
+
+
+
+
+  
+
   
 
 
 
-
 
   
 
@@ -78,10 +102,7 @@
 
 
   
-  
-
-
-
+  
 
   
 

Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=895204&r1=895203&r2=895204&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Sat Jan  2 15:22:41 2010
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
+  
 ]>
 
 

Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=895204&r1=895203&r2=895204&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Sat Jan  2 15:22:41 2010
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
+  
 ]>
 
 

Modified: tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF?rev=895204&r1=895203&r2=895204&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF (original)
+++ tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF Sat Jan  2 15:22:41 
2010
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Export-Package: 
-  org.apache.tomcat.jdbc.pool;version="@@version@@";
+  org.apache.tomcat.jdbc.pool;version="@@VERSION@@";
   uses:="javax.management,javax.naming,javax.naming.spi,javax.sql,
   org.apache.tomcat.jdbc.pool.jmx",
-  org.apache.tomcat.jdbc.pool.interceptor;version="@@version@@";
+  org.apache.tomcat.jdbc.pool.interceptor;version="@@VERSION@@";
   uses:="javax.management.openmbean,org.apache.tomcat.jdbc.pool",
-  org.apache.tomcat.jdbc.pool.jmx;version="@@version@@";
+  org.apache.tomcat.jdbc.pool.jmx;version="@@VERSION@@";
   uses:="javax.management,org.apache.tomcat.jdbc.pool"
 Ant-Version: Apache Ant 1.7.0
 Bundle-Vendor: Apache Software Foundation
-Bundle-Version: @@version@@
+Bundle-Version: @@VERSION@@
 Bundle-Name: Apache Tomcat JDBC Connection Pool
 Bundle-ManifestVersion: 2
 Created-By: 11.0-b16 (Sun Microsystems Inc.)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895206 - in /tomcat/trunk: res/tomcat.nsi webapps/ROOT/index.html

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 15:31:04 2010
New Revision: 895206

URL: http://svn.apache.org/viewvc?rev=895206&view=rev
Log:
Replace copyright year in nsi and html file
with the YEAR tag. It will be automatically
updated via our ant version filter.

Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/ROOT/index.html

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=895206&r1=895205&r2=895206&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sat Jan  2 15:31:04 2010
@@ -25,7 +25,7 @@
   ;Product information
   VIAddVersionKey ProductName "Apache Tomcat"
   VIAddVersionKey CompanyName "Apache Software Foundation"
-  VIAddVersionKey LegalCopyright "Copyright (c) 1999-2010 The Apache Software 
Foundation"
+  VIAddVersionKey LegalCopyright "Copyright (c) 19...@year@ The Apache 
Software Foundation"
   VIAddVersionKey FileDescription "Apache Tomcat Installer"
   VIAddVersionKey FileVersion "2.0"
   VIAddVersionKey ProductVersion "@VERSION@"

Modified: tomcat/trunk/webapps/ROOT/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.html?rev=895206&r1=895205&r2=895206&view=diff
==
--- tomcat/trunk/webapps/ROOT/index.html (original)
+++ tomcat/trunk/webapps/ROOT/index.html Sat Jan  2 15:31:04 2010
@@ -201,7 +201,7 @@
 
 
 
-   Copyright © 1999-2010 Apache Software Foundation
+   Copyright © 19...@year@ Apache Software Foundation
 All Rights Reserved
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895212 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ res/ res/META-INF/ webapps/ROOT/ webapps/docs/ webapps/docs/tribes/ webapps/

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 15:53:43 2010
New Revision: 895212

URL: http://svn.apache.org/viewvc?rev=895212&view=rev
Log:
Update copyright year for TC 6.0.x.

Modified:
tomcat/tc6.0.x/trunk/NOTICE
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl
tomcat/tc6.0.x/trunk/webapps/manager/sessionDetail.jsp
tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp

Modified: tomcat/tc6.0.x/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=895212&r1=895211&r2=895212&view=diff
==
--- tomcat/tc6.0.x/trunk/NOTICE (original)
+++ tomcat/tc6.0.x/trunk/NOTICE Sat Jan  2 15:53:43 2010
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2009 The Apache Software Foundation
+Copyright 1999-2010 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=895212&r1=895211&r2=895212&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java Sat 
Jan  2 15:53:43 2010
@@ -182,7 +182,7 @@
 public static final String HTML_TAIL_SECTION =
 "\n" +
 "\n" +
-" Copyright © 1999-2009, Apache Software Foundation" +
+" Copyright © 1999-2010, Apache Software Foundation" +
 "\n" +
 "\n" +
 "\n" +

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=895212&r1=895211&r2=895212&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
Sat Jan  2 15:53:43 2010
@@ -636,7 +636,7 @@
  * @see javax.servlet.Servlet#getServletInfo()
  */
 public String getServletInfo() {
-return "HTMLManagerServlet, Copyright (c) The Apache Software 
Foundation";
+return "HTMLManagerServlet, Copyright (c) 1999-2010, The Apache 
Software Foundation";
 }   
 
 /**

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=895212&r1=895211&r2=895212&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java 
Sat Jan  2 15:53:43 2010
@@ -186,7 +186,7 @@
 public static final String HTML_TAIL_SECTION =
 "\n" +
 "\n" +
-" Copyright © 1999-2005, Apache Software Foundation" +
+" Copyright © 1999-2010, Apache Software Foundation" +
 "\n" +
 "\n" +
 "\n" +

Modified: tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice?rev=895212&r1=895211&r2=895212&view=diff
==
--- tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice (original)
+++ tomcat/tc6.0.x/trunk/res/META-INF/jasper-jdt.jar.notice Sat Jan  2 15:53:43 
2010
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2009 The Apache Software Foundation
+Copyright 1999-2010 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=895212&r1=895211&r2=895212&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Sat Jan  2 15:53:43 2010
@@ -25,7 +25,7 @@
   ;Product information
   VIAddVersionKey ProductName "Apache Tomcat"
   VIAddVersionKey CompanyName "Apache Sof

svn commit: r895215 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 15:58:25 2010
New Revision: 895215

URL: http://svn.apache.org/viewvc?rev=895215&view=rev
Log:
Add proposal.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=895215&r1=895214&r2=895215&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jan  2 15:58:25 2010
@@ -158,3 +158,10 @@
   http://svn.apache.org/viewvc?rev=895057&view=rev
   +1: kkolinko
   -1:
+
+* Replace a few hard-coded copyright years with
+  current year applied by ant version filter.
+  http://svn.apache.org/viewvc?rev=895203&view=rev
+  http://svn.apache.org/viewvc?rev=895206&view=rev
+  +1: rjung
+  -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895225 [3/3] - in /tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester: ./ shared/ unpshared/ unshared/

2010-01-02 Thread rjung 
Modified: 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/WrapperFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/WrapperFilter.java?rev=895225&r1=895224&r2=895225&view=diff
==
--- 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/WrapperFilter.java
 (original)
+++ 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/WrapperFilter.java
 Sat Jan  2 16:36:10 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999, 2000 ,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *  http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01.java
URL: 
http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01.java?rev=895225&r1=895224&r2=895225&view=diff
==
--- 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01.java
 (original)
+++ 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01.java
 Sat Jan  2 16:36:10 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999, 2000, 2001 ,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *  http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01Parser.java
URL: 
http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01Parser.java?rev=895225&r1=895224&r2=895225&view=diff
==
--- 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01Parser.java
 (original)
+++ 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/Xerces01Parser.java
 Sat Jan  2 16:36:10 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999, 2000, 2001 ,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *  http://www.apache.org/licenses/LICENSE-2.0
  * 

Modified: 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/shared/SharedSessionBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/shared/SharedSessionBean.java?rev=895225&r1=895224&r2=895225&view=diff
==
--- 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/shared/SharedSessionBean.java
 (original)
+++ 
tomcat/archive/tc4.1.x/trunk/container/tester/src/tester/org/apache/tester/shared/SharedSessionBean.java
 Sat Jan  2 16:36:10 2010
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999, 2000 ,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under

svn commit: r895289 - in /tomcat/tc5.5.x/trunk: ./ build/ build/resources/ connectors/ connectors/coyote/ connectors/http11/ connectors/jk/ connectors/jk/jkstatus/ connectors/jni/ connectors/juli/ con

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 21:09:36 2010
New Revision: 895289

URL: http://svn.apache.org/viewvc?rev=895289&view=rev
Log:
Update copyright year for TC 5.5.x.

Modified:
tomcat/tc5.5.x/trunk/NOTICE
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/build/resources/build.xml
tomcat/tc5.5.x/trunk/build/tomcat.nsi
tomcat/tc5.5.x/trunk/connectors/build.xml
tomcat/tc5.5.x/trunk/connectors/coyote/build.xml
tomcat/tc5.5.x/trunk/connectors/http11/build.xml
tomcat/tc5.5.x/trunk/connectors/jk/build.xml
tomcat/tc5.5.x/trunk/connectors/jk/jkstatus/build.xml
tomcat/tc5.5.x/trunk/connectors/jni/build.xml
tomcat/tc5.5.x/trunk/connectors/juli/build.xml
tomcat/tc5.5.x/trunk/connectors/util/build.xml
tomcat/tc5.5.x/trunk/container/catalina/build.xml
tomcat/tc5.5.x/trunk/container/modules/cluster/build.xml
tomcat/tc5.5.x/trunk/container/modules/groupcom/build.xml
tomcat/tc5.5.x/trunk/container/modules/groupcom/build/build.xml
tomcat/tc5.5.x/trunk/container/modules/groupcom/doc/tomcat-docs.xsl
tomcat/tc5.5.x/trunk/container/modules/ha/build.xml
tomcat/tc5.5.x/trunk/container/modules/storeconfig-ha/build.xml
tomcat/tc5.5.x/trunk/container/modules/storeconfig/build.xml
tomcat/tc5.5.x/trunk/container/tester/build.xml
tomcat/tc5.5.x/trunk/container/webapps/ROOT/index.jsp
tomcat/tc5.5.x/trunk/container/webapps/docs/tomcat-docs.xsl

tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/Constants.java

tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java
tomcat/tc5.5.x/trunk/container/webapps/webdav/index.html
tomcat/tc5.5.x/trunk/jasper/build.xml
tomcat/tc5.5.x/trunk/servletapi/jsr152/build.xml
tomcat/tc5.5.x/trunk/servletapi/jsr154/build.xml

Modified: tomcat/tc5.5.x/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/NOTICE?rev=895289&r1=895288&r2=895289&view=diff
==
--- tomcat/tc5.5.x/trunk/NOTICE (original)
+++ tomcat/tc5.5.x/trunk/NOTICE Sat Jan  2 21:09:36 2010
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2009 The Apache Software Foundation
+Copyright 1999-2010 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
@@ -18,4 +18,4 @@
 Java compilation software for JSP pages is provided by Eclipse, 
 which is open source software.  The original software and 
 related information is available at
-http://www.eclipse.org/.
\ No newline at end of file
+http://www.eclipse.org/.

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=895289&r1=895288&r2=895289&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Sat Jan  2 21:09:36 2010
@@ -37,7 +37,7 @@
 
   
   
-  
+  
   
   
   

Modified: tomcat/tc5.5.x/trunk/build/resources/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/build.xml?rev=895289&r1=895288&r2=895289&view=diff
==
--- tomcat/tc5.5.x/trunk/build/resources/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/resources/build.xml Sat Jan  2 21:09:36 2010
@@ -36,7 +36,7 @@
 
   
   
-  
+  
   
   
   

Modified: tomcat/tc5.5.x/trunk/build/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/tomcat.nsi?rev=895289&r1=895288&r2=895289&view=diff
==
--- tomcat/tc5.5.x/trunk/build/tomcat.nsi (original)
+++ tomcat/tc5.5.x/trunk/build/tomcat.nsi Sat Jan  2 21:09:36 2010
@@ -27,7 +27,7 @@
   ;Product information
   VIAddVersionKey ProductName "Apache Tomcat"
   VIAddVersionKey CompanyName "Apache Software Foundation"
-  VIAddVersionKey LegalCopyright "Copyright (c) 1999-2009 The Apache Software 
Foundation"
+  VIAddVersionKey LegalCopyright "Copyright (c) 1999-2010 The Apache Software 
Foundation"
   VIAddVersionKey FileDescription "Apache Tomcat Installer"
   VIAddVersionKey FileVersion "2.0"
   VIAddVersionKey ProductVersion "@VERSION@"

Modified: tomcat/tc5.5.x/trunk/connectors/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/build.xml?rev=895289&r1=895288&r2=895289&view=diff
==
--- tomcat/tc5.5.x/trunk/connectors/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/build.xml Sat Jan  2 21:09:36 2010
@@ -140,7 +140,7 @@
   version="true"
   windowtitle="Tomcat Connector Documentation"
   doctitle="Tomcat Connector"
-  bottom="Copyright © 2003-2009 Apache Software Foundation.  All 
Rights Reserved.">
+  bottom

svn commit: r895293 - in /tomcat/site/trunk/xdocs: legal.xml stylesheets/tomcat-site.xsl stylesheets/tomcat.css

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 21:20:00 2010
New Revision: 895293

URL: http://svn.apache.org/viewvc?rev=895293&view=rev
Log:
Update copyright year for TC site.

Modified:
tomcat/site/trunk/xdocs/legal.xml
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
tomcat/site/trunk/xdocs/stylesheets/tomcat.css

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=895293&r1=895292&r2=895293&view=diff
==
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Sat Jan  2 21:20:00 2010
@@ -11,7 +11,7 @@
   
 
 
-All material on this website is Copyright © 1999-2009, The Apache 
+All material on this website is Copyright © 1999-2010, The Apache 
 Software Foundation
 
 

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=895293&r1=895292&r2=895293&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Sat Jan  2 21:20:00 2010
@@ -131,7 +131,7 @@
   PAGE FOOTER
   
 
-Copyright © 1999-2009, The Apache Software Foundation
+Copyright © 1999-2010, The Apache Software Foundation
 
 "Apache", the Apache feather, and the Apache Tomcat logo are
 trademarks of the Apache Software Foundation for our open source

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat.css
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat.css?rev=895293&r1=895292&r2=895293&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat.css Sat Jan  2 21:20:00 2010
@@ -1,5 +1,5 @@
 /*
-* Copyright 2002-2006 The Apache Software Foundation
+* Copyright 2002-2010 The Apache Software Foundation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r895295 - /tomcat/site/trunk/docs/

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 21:27:28 2010
New Revision: 895295

URL: http://svn.apache.org/viewvc?rev=895295&view=rev
Log:
Update transformations.

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-55.html
tomcat/site/trunk/docs/download-60.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/svn.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=895295&r1=895294&r2=895295&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Sat Jan  2 21:27:28 2010
@@ -525,7 +525,7 @@
 
 
 
-Copyright © 1999-2009, The Apache Software Foundation
+Copyright © 1999-2010, The Apache Software Foundation
 
 "Apache", the Apache feather, and the Apache Tomcat logo are
 trademarks of the Apache Software Foundation for our open source

Modified: tomcat/site/trunk/docs/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=895295&r1=895294&r2=895295&view=diff
==
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Sat Jan  2 21:27:28 2010
@@ -289,7 +289,7 @@
 
 
 
-Copyright © 1999-2009, The Apache Software Foundation
+Copyright © 1999-2010, The Apache Software Foundation
 
 "Apache", the Apache feather, and the Apache Tomcat logo are
 trademarks of the Apache Software Foundation for our open source

Modified: tomcat/site/trunk/docs/download-55.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=895295&r1=895294&r2=895295&view=diff
==
--- tomcat/site/trunk/docs/download-55.html (original)
+++ tomcat/site/trunk/docs/download-55.html Sat Jan  2 21:27:28 2010
@@ -504,7 +504,7 @@
 
 
 
-Copyright © 1999-2009, The Apache Software Foundation
+Copyright © 1999-2010, The Apache Software Foundation
 
 "Apache", the Apache feather, and the Apache Tomcat logo are
 trademarks of the Apache Software Foundation for our open source

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=895295&r1=895294&r2=895295&view=diff
==
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Sat Jan  2 21:27:28 2010
@@ -449,7 +449,7 @@
 
 
 
-Copyright © 1999-2009, The Apache Software Foundation
+Copyright © 1999-2010, The Apache Software Foundation
 
 "Apache", the Apache feather, and the Apache Tomcat logo are
 trademarks of the Apache Software Foundation for our open source

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=895295&r1=895294&r2=895295&view=diff
==
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Sat Jan  2 21:27:28 2010
@@ -420,7 +420,7 @@
 
 
 
-Copyright © 1999-2009, The Apache Software Foundation
+Copyright © 1999-2010, The Apache Software Foundation
 
 "Apache", the Apache feather, and the Apache Tomcat logo are
 trademarks of the Apache Software Foundation for our open source

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=895295&r1=895294&r2=895295&view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-nati

svn commit: r895297 - in /tomcat/native/trunk: NOTICE build.xml xdocs/style.xsl

2010-01-02 Thread rjung 
Author: rjung
Date: Sat Jan  2 21:44:57 2010
New Revision: 895297

URL: http://svn.apache.org/viewvc?rev=895297&view=rev
Log:
Update copyright year for TC native trunk.

Modified:
tomcat/native/trunk/NOTICE
tomcat/native/trunk/build.xml
tomcat/native/trunk/xdocs/style.xsl

Modified: tomcat/native/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/NOTICE?rev=895297&r1=895296&r2=895297&view=diff
==
--- tomcat/native/trunk/NOTICE (original)
+++ tomcat/native/trunk/NOTICE Sat Jan  2 21:44:57 2010
@@ -1,3 +1,5 @@
+Apache Tomcat Native Library
+Copyright 2002-2010 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-

Modified: tomcat/native/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=895297&r1=895296&r2=895297&view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Sat Jan  2 21:44:57 2010
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
@@ -179,7 +179,7 @@
 packagenames="org.apache.tomcat.*"
 windowtitle="${title} (Version ${version})"
 doctitle="
${title} (Version ${version})
"
-bottom="Copyright 2002-2009 The Apache Software Foundation. (https://issues.apache.org/bugzilla/attachment.cgi?id=24788)
Patch for catalina.bat#885002 (renew#2), document added

Patch updated.
I documented these environment variables in this patch, hope there's no
chinglish in it:

TITLE   (Optional) Specify the title of Tomcat window. The default
TITLE is Tomcat if it's not specified.
Example (all one line)
set TITLE=Tomcat Server 1

TITLE_WITH_TIME (Optional) If set, regardless the value of it, current
datetime will be appended to title, so that you can know
the startup time of Tomcat from title.
Example (all one line)
set TITLE_WITH_TIME=whatever non empty value

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org