svn commit: r1564660 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/ test/webapp-3.0-fragments/WEB-INF/ webapps/docs/

[violetagg]

Author: violetagg
Date: Wed Feb  5 07:58:38 2014
New Revision: 1564660

URL: http://svn.apache.org/r1564660
Log:
Merged revision 1564461 from tomcat/trunk:
According to JavaEE specification (EE.5.4.1.3) when an env entry is specified 
in the web deployment descriptor and with annotation then the definition in the 
web deployment descriptor is with priority.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1564461

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1564660&r1=1564659&r2=1564660&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Wed 
Feb  5 07:58:38 2014
@@ -22,6 +22,7 @@ package org.apache.catalina.startup;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
+import org.apache.catalina.deploy.ContextEnvironment;
 import org.apache.catalina.deploy.ContextHandler;
 import org.apache.catalina.deploy.ContextService;
 import org.apache.catalina.deploy.ResourceBase;
@@ -533,6 +534,7 @@ public class WebRuleSet extends RuleSetB
 digester.addSetNext(fullPrefix + "/env-entry",
 "addEnvEntry",
 "org.apache.catalina.deploy.ContextEnvironment");
+digester.addRule(fullPrefix + "/env-entry", new SetOverrideRule());
 digester.addCallMethod(fullPrefix + "/env-entry/description",
"setDescription", 0);
 digester.addCallMethod(fullPrefix + "/env-entry/env-entry-name",
@@ -1336,3 +1338,21 @@ final class LifecycleCallbackRule extend
 super.end(namespace, name);
 }
 }
+
+final class SetOverrideRule extends Rule {
+
+public SetOverrideRule() {
+// no-op
+}
+
+@Override
+public void begin(String namespace, String name, Attributes attributes)
+throws Exception {
+ContextEnvironment envEntry = (ContextEnvironment) digester.peek();
+envEntry.setOverride(false);
+if (digester.getLogger().isDebugEnabled()) {
+digester.getLogger().debug(
+envEntry.getClass().getName() + ".setOverride(false)");
+}
+}
+}

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1564660&r1=1564659&r2=1564660&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java 
Wed Feb  5 07:58:38 2014
@@ -143,7 +143,7 @@ public class TestContextConfig extends T
 tomcat.start();
 
 assertPageContains("/test/testServlet",
-"envEntry1: 1 envEntry2: 2 envEntry3: 33 envEntry4: 4");
+"envEntry1: 1 envEntry2: 2 envEntry3: 33 envEntry4: 4 
envEntry5: 55 envEntry6: 66");
 }
 
 @Test

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java?rev=1564660&r1=1564659&r2=1564660&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
 Wed Feb  5 07:58:38 2014
@@ -38,6 +38,11 @@ public class TesterServletWithAnnotation
 
 private int envEntry4;
 
+@Resource(name = "envEntry5", mappedName = "5")
+private int envEntry5;
+
+private int envEntry6;
+
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
@@ -46,6 +51,8 @@ public class TesterServletWithAnnotation
 resp.getWriter().print(" envEntry2: " + envEntry2);
 resp.getWriter().print(" envEntry3: " + envEntry3);
 resp.getWriter().print(" envEntry4: " + envEntry4);
+resp.getWriter().print(" envEntry5: " + envEntry5);
+  

svn commit: r1564656 - in /tomcat/jk/trunk/xdocs: ajp/project.xml generic_howto/project.xml index.xml miscellaneous/project.xml news/20140201.xml news/project.xml project.xml reference/project.xml web

[mturk]

Author: mturk
Date: Wed Feb  5 07:51:43 2014
New Revision: 1564656

URL: http://svn.apache.org/r1564656
Log:
Add year 2014 news document

Added:
tomcat/jk/trunk/xdocs/news/20140201.xml   (with props)
Modified:
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/generic_howto/project.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/project.xml
tomcat/jk/trunk/xdocs/webserver_howto/project.xml

Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/generic_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Wed Feb  5 07:51:43 2014
@@ -327,6 +327,8 @@ This page contains information, on some 
 
 
 
+2014
+
 2012
 
 2011

Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Added: tomcat/jk/trunk/xdocs/news/20140201.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20140201.xml?rev=1564656&view=auto
==
--- tomcat/jk/trunk/xdocs/news/20140201.xml (added)
+++ tomcat/jk/trunk/xdocs/news/20140201.xml Wed Feb  5 07:51:43 2014
@@ -0,0 +1,37 @@
+
+
+
+]>
+
+
+  &project;
+
+  
+Apache Tomcat Connectors 
Project
+2014 News and Status
+  
+
+
+
+
+
+
+
+
+

Propchange: tomcat/jk/trunk/xdocs/news/20140201.xml
--
svn:eol-style = native

Modified: tomcat/jk/trunk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/news/project.xml (original)
+++ tomcat/jk/trunk/xdocs/news/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/project.xml (original)
+++ tomcat/jk/trunk/xdocs/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/reference/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/project.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/webserver_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/project.xml?rev=1564656&r1=1564655&r2=1564656&view=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/project.xml Wed Feb  5 07:51:43 2014
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 



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

svn commit: r1564651 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Feb  5 07:19:13 2014
New Revision: 1564651

URL: http://svn.apache.org/r1564651
Log:
Pickup yesterdays DBCP changes

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1564651&r1=1564650&r2=1564651&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Feb  5 07:19:13 2014
@@ -153,7 +153,7 @@ tomcat-native.win.2=${base-tomcat.loc.2}
 #commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
 
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
 
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20140204.023716-160
+commons-dbcp.version=2.0-20140204.203657-164
 commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
 
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
 
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564651&r1=1564650&r2=1564651&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb  5 07:19:13 2014
@@ -100,7 +100,7 @@
 Windows installer. (markt)
   
   
-Update Commons DBCP 2 to snapshot 160 dated 04 Feb 2014. (markt)
+Update Commons DBCP 2 to snapshot 164 dated 04 Feb 2014. (markt)
   
 
   



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

svn commit: r1564649 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Feb  5 07:17:31 2014
New Revision: 1564649

URL: http://svn.apache.org/r1564649
Log:
Keep a note of Commons DBCP updates

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564649&r1=1564648&r2=1564649&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb  5 07:17:31 2014
@@ -99,6 +99,9 @@
 56104: Correct the version number on the welcome page of the
 Windows installer. (markt)
   
+  
+Update Commons DBCP 2 to snapshot 160 dated 04 Feb 2014. (markt)
+  
 
   
 



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

svn commit: r1564648 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Feb  5 07:15:49 2014
New Revision: 1564648

URL: http://svn.apache.org/r1564648
Log:
Whitespace police

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564648&r1=1564647&r2=1564648&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb  5 07:15:49 2014
@@ -72,7 +72,7 @@
   
 When environment entry with one and the same name is defined in the web
 deployment descriptor and with annotation then the one specified in the
-web deployment descriptor is with priority. (violetagg) 
+web deployment descriptor is with priority. (violetagg)
   
 
   



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

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140205.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar
 
get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140205.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140205.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140205.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-17.0-SNAPSHOT.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2755 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:75: Line 
matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:524: Got 1 errors and 0 
warnings.

Total time: 24 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20140205060004, vmgump.apache.org:vmgump:20140205060004
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 74 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140205.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar
 
get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140205.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140205.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140205.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-17.0-SNAPSHOT.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2755 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:75: Line 
matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:524: Got 1 errors and 0 
warnings.

Total time: 24 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2014020507, vmgump.apache.org:vmgump:2014020507
Gump E-mail Identifier (unique within run) #2.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

[Bug 56108] New: Allow user-defined Diffie-Hellman parameters

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56108

Bug ID: 56108
   Summary: Allow user-defined Diffie-Hellman parameters
   Product: Tomcat Native
   Version: 1.1.29
  Hardware: PC
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: m...@normi.net

Currently, the SSL_CTX_set_tmp_dh_callback() function is used to define a
callback to retrieve DH parameters for SSL connections. Unfortunately, as a
side-effect of the OpenSSL implementation, this means that only 1024 bit DH
keys are used [1].

It's probably better to provide the user with an option to explicitly set the
DH parameters (generated using openssl dhparam), which makes it possible to use
DH parameters over 1024 bits. SSL_CTX_set_tmp_dh() can be used for this.

[1] https://groups.google.com/forum/#!topic/mailing.openssl.users/UmdbGRFsFmY

-- 
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

[Bug 53762] JK status manager: mass nodes handling doesn't works

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53762

Brad  changed:

   What|Removed |Added

 CC||mail-asf-bugzi...@so14k.com

--- Comment #3 from Brad  ---
The patch resolved this for me as well. Does no one else use mod_jk to balance
between multiple tomcat backends?

-- 
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

[Bug 55915] Add EECDH support to tcnative-1.dll

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=55915

--- Comment #1 from Mike Noordermeer  ---
Created attachment 31283
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=31283&action=edit
Add ECDHE support to Tomcat Native.

It's not just the Windows binary, the source is also missing the required call
to SSL_CTX_set_tmp_ecdh() on other platforms.

A minimal patch to enable ECDHE using the NIST P256 EC is attached. If the EC
has to be user selectable, adding it to TC Native will probably require some
more work (but since the DH params are fixed too, I think this should suffice). 

It may also be necessary to add a call to SSL_set_tmp_ecdh() in sslnetwork.c,
but I'm not sure how that will be used.

-- 
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

Re: Re: support for salted passwords

[Gabriel E. Sánchez Martínez]

On 02/04/2014 12:20 PM, Christopher Schultz wrote:

Nick,

On 2/2/14, 2:51 AM, Nick Williams wrote:

On Feb 2, 2014, at 1:23 AM, Gabriel E. Sánchez Martínez wrote:

I am very new to Tomcat but am already getting my feet wet with a
web application.  A requirement for this application is form-based
password authentication, and I would like to store passwords in a
database using salted SHA-512 digests

I can't speak to most of this email, but don't do this. SHA-x is a
*fast* hashing algorithm. It's not designed for passwords. The
problem with fast hashing algorithms is that they are *very*
susceptible to rainbow table attacks. Modern password-hacking systems
with 24 GPUs can calculate billions of MD5 and SHA-x hash attacks per
second.

I strongly recommend you use a *slow* hashing algorithm such as
bcrypt, which is designed specifically for hashing passwords. These
algorithms use more than just CPU/GPU operations (such as memory).
Password hacking systems can only calculate thousands of these per
second instead of millions. It's much better protection in case your
password database is ever stolen.

While you are completely correct in your assessment (crypto hashes don't
make good password hashes), the fact that Tomcat supports only the
former is a somewhat tacit affirmation that simply using crypto hashing
for passwords is good security.

I've been tossing-around some upgrades in my mind for the realm
implementations that would allow for better pluggability for things like
this. Right now, the only way to implement, say, bcrypt, would be to
write your own Realm. That's silly: all you need to do is implement two
methods: mutatePassword() and verifyMutatedPassword().

That opens the door for all kinds of things like bcrypt/scrypt/etc. with
a trivial pluggable interface.

Since it sounds like there's a bit of appetite for this, I may spend
some more time on this (that is, some at all).

-chris



Bravo!  I agree on a need for more pluggability.  And I believe that out 
of the box it should offer stronger protection.  Ideally hashes designed 
for password storage, but if not at least it should support salting.


- Gabriel

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

svn commit: r1564461 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/web/ test/org/apache/catalina/startup/ test/webapp-fragments/WEB-INF/ webapps/docs/

[violetagg]

Author: violetagg
Date: Tue Feb  4 20:18:35 2014
New Revision: 1564461

URL: http://svn.apache.org/r1564461
Log:
According to JavaEE specification (EE.5.4.1.3) when an env entry is specified 
in the web deployment descriptor and with annotation then the definition in the 
web deployment descriptor is with priority.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java

tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
tomcat/trunk/test/webapp-fragments/WEB-INF/web.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?rev=1564461&r1=1564460&r2=1564461&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java Tue 
Feb  4 20:18:35 2014
@@ -526,6 +526,7 @@ public class WebRuleSet extends RuleSetB
 digester.addSetNext(fullPrefix + "/env-entry",
 "addEnvEntry",
 
"org.apache.tomcat.util.descriptor.web.ContextEnvironment");
+digester.addRule(fullPrefix + "/env-entry", new SetOverrideRule());
 digester.addCallMethod(fullPrefix + "/env-entry/description",
"setDescription", 0);
 digester.addCallMethod(fullPrefix + "/env-entry/env-entry-name",
@@ -1350,3 +1351,19 @@ final class LifecycleCallbackRule extend
 super.end(namespace, name);
 }
 }
+
+final class SetOverrideRule extends Rule {
+
+public SetOverrideRule() {
+// no-op
+}
+
+@Override
+public void begin(String namespace, String name, Attributes attributes) 
throws Exception {
+ContextEnvironment envEntry = (ContextEnvironment) digester.peek();
+envEntry.setOverride(false);
+if (digester.getLogger().isDebugEnabled()) {
+digester.getLogger().debug(envEntry.getClass().getName() + 
".setOverride(false)");
+}
+}
+}

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1564461&r1=1564460&r2=1564461&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Tue 
Feb  4 20:18:35 2014
@@ -143,7 +143,7 @@ public class TestContextConfig extends T
 tomcat.start();
 
 assertPageContains("/test/testServlet",
-"envEntry1: 1 envEntry2: 2 envEntry3: 33 envEntry4: 4");
+"envEntry1: 1 envEntry2: 2 envEntry3: 33 envEntry4: 4 
envEntry5: 55 envEntry6: 66");
 }
 
 @Test

Modified: 
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java?rev=1564461&r1=1564460&r2=1564461&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java 
Tue Feb  4 20:18:35 2014
@@ -38,6 +38,11 @@ public class TesterServletWithAnnotation
 
 private int envEntry4;
 
+@Resource(name = "envEntry5", mappedName = "5")
+private int envEntry5;
+
+private int envEntry6;
+
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
@@ -46,6 +51,8 @@ public class TesterServletWithAnnotation
 resp.getWriter().print(" envEntry2: " + envEntry2);
 resp.getWriter().print(" envEntry3: " + envEntry3);
 resp.getWriter().print(" envEntry4: " + envEntry4);
+resp.getWriter().print(" envEntry5: " + envEntry5);
+resp.getWriter().print(" envEntry6: " + envEntry6);
 }
 
 public void setEnvEntry2(int envEntry2) {
@@ -61,4 +68,9 @@ public class TesterServletWithAnnotation
 public void setEnvEntry4(int envEntry4) {
 this.envEntry4 = envEntry4;
 }
+
+@Resource(name = "envEntry6", mappedName = "6")
+public void setEnvEntry6(int envEntry6) {
+this.envEntry6 = envEntry6;
+}
 }
\ No newline at end of file

Modified: tomcat/trunk/test/webapp-fragments/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-fragments/WEB-INF/web.xml?rev=1564461&r1=1564460&r2=1564461&view=diff
===

[Bug 56096] Setting rmiBindAddress on JmxRemoteLifecycleListener prevents tomcat from starting

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56096

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Violeta Georgieva  ---
Thanks for the report.
Fixed in trunk and 7.0.x and will be included in 8.0.2 and 7.0.51 onwards.

Regards
Violeta

-- 
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

svn commit: r1564417 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Tue Feb  4 18:53:45 2014
New Revision: 1564417

URL: http://svn.apache.org/r1564417
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56096
Merged revisions 1564299, 1564414 from tomcat/trunk:
When creating JMXConnectorServer use the correct rmiBindAddress. Patch provided 
by Jim Talbut.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1564299,1564414

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1564417&r1=1564416&r2=1564417&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
 Tue Feb  4 18:53:45 2014
@@ -256,7 +256,7 @@ public class JmxRemoteLifecycleListener 
 
 
 // Create the Platform server
-csPlatform = createServer("Platform", rmiRegistryPortPlatform,
+csPlatform = createServer("Platform", rmiBindAddress, 
rmiRegistryPortPlatform,
 rmiServerPortPlatform, env, csf, ssf,
 ManagementFactory.getPlatformMBeanServer());
 
@@ -266,7 +266,7 @@ public class JmxRemoteLifecycleListener 
 }
 
 private JMXConnectorServer createServer(String serverName,
-int theRmiRegistryPort, int theRmiServerPort,
+String bindAddress, int theRmiRegistryPort, int theRmiServerPort,
 HashMap theEnv, RMIClientSocketFactory csf,
 RMIServerSocketFactory ssf, MBeanServer theMBeanServer) {
 
@@ -280,11 +280,19 @@ public class JmxRemoteLifecycleListener 
 return null;
 }
 
+if (bindAddress == null) {
+bindAddress = "localhost";
+}
+
 // Build the connection string with fixed ports
 StringBuilder url = new StringBuilder();
-url.append("service:jmx:rmi://localhost:");
+url.append("service:jmx:rmi://");
+url.append(bindAddress);
+url.append(":");
 url.append(theRmiServerPort);
-url.append("/jndi/rmi://localhost:");
+url.append("/jndi/rmi://");
+url.append(bindAddress);
+url.append(":");
 url.append(theRmiRegistryPort);
 url.append("/jmxrmi");
 JMXServiceURL serviceUrl;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1564417&r1=1564416&r2=1564417&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Feb  4 18:53:45 2014
@@ -130,6 +130,12 @@
 56082: Fix a concurrency bug in JULI's LogManager
 implementation. (markt)
   
+  
+56096: When the attribute rmiBindAddress of the
+JMX Remote Lifecycle Listener is specified it's value will be used when
+constructing the address of a JMX API connector server. Patch is
+provided by Jim Talbut. (violetagg)
+  
 
   
   



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

svn commit: r1564414 - /tomcat/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Tue Feb  4 18:44:32 2014
New Revision: 1564414

URL: http://svn.apache.org/r1564414
Log:
Update the changelog.

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564414&r1=1564413&r2=1564414&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb  4 18:44:32 2014
@@ -63,6 +63,12 @@
   
 Simplify Catalina.initDirs(). (kkolinko)
   
+  
+56096: When the attribute rmiBindAddress of the
+JMX Remote Lifecycle Listener is specified it's value will be used when
+constructing the address of a JMX API connector server. Patch is
+provided by Jim Talbut. (violetagg)
+  
 
   
   



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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/5471

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1564312
Blamelist: kkolinko

Build succeeded!

sincerely,
 -The Buildbot

Re: Remove svn:keywords in Tomcat 6, 7, 8.

[Konstantin Kolinko]

2014-01-27 Konstantin Kolinko :
> 2014-01-25 Konstantin Kolinko :
>> 2014/1/24 Konstantin Kolinko :
>>> Hi!
>>>
>>> With so many people looking forward to Git [1] I think it is time to
>>> remove svn keywords from our source files.
>>>
>>> There are two things:
>>> 1) Remove $Id$ etc. lines from the files
>>> 2) Remove svn:keywords property
>>> svn propdel svn:keywords --depth infinity
>>>
>>> "1)" is motivated by lack of support for such properties in Git.
>>> "2)" will make Subversion a bit faster by removing the need to scan
>>> files for keywords.
>>>
>>> Any objection to proceed with this?
>>>
>>> I think this can also be applied to Tomcat 6.
>>> Technically, all keywords are in comments, so it nearly qualifies for
>>> CTR. Any objections here?
>>>
>>
>> Completed with Tomcat 8.
>> (...)
>
> Completed with Tomcat 7.
>

Completed with Tomcat 6.

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: r1564399 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/ClusterDeployer.java

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 17:40:00 2014
New Revision: 1564399

URL: http://svn.apache.org/r1564399
Log:
Merged r1564398 from tomcat/trunk:
Move class Javadoc to the correct place

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1564398

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java?rev=1564399&r1=1564398&r2=1564399&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Tue 
Feb  4 17:40:00 2014
@@ -17,18 +17,18 @@
 
 package org.apache.catalina.ha;
 
-/**
- * A ClusterDeployer interface allows to plug in and out the
- * different deployment implementations
- *
- * @author Filip Hanik
- */
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.tribes.ChannelListener;
 
+/**
+ * A ClusterDeployer interface allows to plug in and out the
+ * different deployment implementations
+ *
+ * @author Filip Hanik
+ */
 public interface ClusterDeployer extends ChannelListener {
 /**
  * Descriptive information about this component implementation.



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

svn commit: r1564398 - /tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 17:36:38 2014
New Revision: 1564398

URL: http://svn.apache.org/r1564398
Log:
Move class Javadoc to the correct place

Modified:
tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java?rev=1564398&r1=1564397&r2=1564398&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Tue Feb  4 
17:36:38 2014
@@ -17,16 +17,16 @@
 
 package org.apache.catalina.ha;
 
-/**
- * A ClusterDeployer interface allows to plug in and out the
- * different deployment implementations
- */
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.tribes.ChannelListener;
 
+/**
+ * A ClusterDeployer interface allows to plug in and out the
+ * different deployment implementations
+ */
 public interface ClusterDeployer extends ChannelListener {
 
 /**



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

svn commit: r1564392 - in /tomcat/tc6.0.x/trunk: java/javax/annotation/ java/javax/annotation/security/ java/javax/ejb/ java/javax/el/ java/javax/mail/ java/javax/mail/internet/ java/javax/persistence

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 17:30:20 2014
New Revision: 1564392

URL: http://svn.apache.org/r1564392
Log:
CTR: comments + discussed on dev list
Remove svn:keywords from the rest of files in Tomcat 6.
Update changelog.
Keywords removal in Tomcat 6 is done.

Modified:
tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/Resources.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DeclareRoles.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/ejb/EJBs.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ArrayELResolver.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/BeanELResolver.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/CompositeELResolver.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/el/ELContext.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ELContextEvent.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ELContextListener.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ELException.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ELResolver.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/Expression.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ExpressionFactory.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/FunctionMapper.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ListELResolver.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings_es.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/el/MapELResolver.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/MethodExpression.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/MethodInfo.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/MethodNotFoundException.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/el/PropertyNotFoundException.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/el/PropertyNotWritableException.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/el/ValueExpression.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/el/VariableMapper.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/mail/Authenticator.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/mail/PasswordAuthentication.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/mail/Session.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/mail/internet/InternetAddress.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/mail/internet/MimeMessage.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/mail/internet/MimePart.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/mail/internet/MimePartDataSource.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContextType.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContexts.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceProperty.java   
(props changed)
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceUnit.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceUnits.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/Filter.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/FilterChain.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/FilterConfig.java   (props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_es.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/LocalStrings_ja.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/RequestDispatcher.java   (props 
changed)
tomcat/tc6

Re: support for salted passwords

[Christopher Schultz]

Nick,

On 2/2/14, 2:51 AM, Nick Williams wrote:
> On Feb 2, 2014, at 1:23 AM, Gabriel E. Sánchez Martínez wrote:
>> I am very new to Tomcat but am already getting my feet wet with a
>> web application.  A requirement for this application is form-based
>> password authentication, and I would like to store passwords in a
>> database using salted SHA-512 digests
> 
> I can't speak to most of this email, but don't do this. SHA-x is a
> *fast* hashing algorithm. It's not designed for passwords. The
> problem with fast hashing algorithms is that they are *very*
> susceptible to rainbow table attacks. Modern password-hacking systems
> with 24 GPUs can calculate billions of MD5 and SHA-x hash attacks per
> second.
> 
> I strongly recommend you use a *slow* hashing algorithm such as
> bcrypt, which is designed specifically for hashing passwords. These
> algorithms use more than just CPU/GPU operations (such as memory).
> Password hacking systems can only calculate thousands of these per
> second instead of millions. It's much better protection in case your
> password database is ever stolen.

While you are completely correct in your assessment (crypto hashes don't
make good password hashes), the fact that Tomcat supports only the
former is a somewhat tacit affirmation that simply using crypto hashing
for passwords is good security.

I've been tossing-around some upgrades in my mind for the realm
implementations that would allow for better pluggability for things like
this. Right now, the only way to implement, say, bcrypt, would be to
write your own Realm. That's silly: all you need to do is implement two
methods: mutatePassword() and verifyMutatedPassword().

That opens the door for all kinds of things like bcrypt/scrypt/etc. with
a trivial pluggable interface.

Since it sounds like there's a bit of appetite for this, I may spend
some more time on this (that is, some at all).

-chris



signature.asc
Description: OpenPGP digital signature

svn commit: r1564383 - in /tomcat/tc6.0.x/trunk/java/javax/servlet: ./ http/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 17:18:09 2014
New Revision: 1564383

URL: http://svn.apache.org/r1564383
Log:
CTR: comments + discussed on dev list
Remove keywords from java/javax/**

Modified:
tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java
tomcat/tc6.0.x/trunk/java/javax/servlet/RequestDispatcher.java
tomcat/tc6.0.x/trunk/java/javax/servlet/Servlet.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletContext.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletException.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletInputStream.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletOutputStream.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletRequest.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletResponse.java
tomcat/tc6.0.x/trunk/java/javax/servlet/ServletResponseWrapper.java
tomcat/tc6.0.x/trunk/java/javax/servlet/SingleThreadModel.java
tomcat/tc6.0.x/trunk/java/javax/servlet/UnavailableException.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/Cookie.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpServletResponse.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpSession.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpSessionBindingListener.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/HttpSessionContext.java
tomcat/tc6.0.x/trunk/java/javax/servlet/http/LocalStrings_es.properties

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java?rev=1564383&r1=1564382&r2=1564383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/GenericServlet.java Tue Feb  4 
17:18:09 2014
@@ -42,7 +42,7 @@ import java.util.Enumeration;
  *
  *
  * @author Various
- * @version$Version$
+ *
  *
  *
  *

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/RequestDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/RequestDispatcher.java?rev=1564383&r1=1564382&r2=1564383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/RequestDispatcher.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/RequestDispatcher.java Tue Feb  4 
17:18:09 2014
@@ -33,7 +33,7 @@ import java.io.IOException;
  * objects to wrap any type of resource.
  *
  * @author Various
- * @version$Version$
+ *
  *
  * @seeServletContext#getRequestDispatcher(java.lang.String)
  * @seeServletContext#getNamedDispatcher(java.lang.String)

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/Servlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/Servlet.java?rev=1564383&r1=1564382&r2=1564383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/Servlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/Servlet.java Tue Feb  4 17:18:09 
2014
@@ -50,7 +50,7 @@ import java.io.IOException;
  * such as author, version, and copyright.
  *
  * @author Various
- * @version$Version$
+ *
  *
  * @seeGenericServlet
  * @seejavax.servlet.http.HttpServlet

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/ServletContext.java?rev=1564383&r1=1564382&r2=1564383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/ServletContext.java Tue Feb  4 
17:18:09 2014
@@ -46,7 +46,7 @@ import java.util.Set;
  * servlet when the servlet is initialized.
  *
  * @author Various
- * @version$Version$
+ *
  *
  * @seeServlet#getServletConfig
  * @seeServletConfig#getServletContext

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/ServletException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/ServletException.java?rev=1564383&r1=1564382&r2=1564383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/ServletException.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/ServletException.java Tue Feb  4 
17:18:09 2014
@@ -22,7 +22,7 @@ package javax.servlet;
  * encounters difficulty.
  *
  * @author Various
- * @version$Version$
+ *
  */
 public class ServletException extends Exception {
 

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

svn commit: r1564381 - in /tomcat/tc6.0.x/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 17:13:10 2014
New Revision: 1564381

URL: http://svn.apache.org/r1564381
Log:
Remove svn keywords and similar constructs for other source code
management systems from schema and DTD files
(backport of r1561706)

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd   (props 
changed)

tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd 
  (props changed)

tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd 
  (props changed)

tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd 
  (contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/XMLSchema.dtd   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/datatypes.dtd   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_1_4.xsd   (contents, 
props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_1_1.xsd 
  (contents, props changed)

tomcat/tc6.0.x/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
   (contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd

tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd

tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_2.dtd   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_3.dtd   (props 
changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/xml.xsd   (props changed)

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1564381&r1=1564380&r2=1564381&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb  4 17:13:10 2014
@@ -28,32 +28,6 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Remove svn keywords and similar constructs for other source code
-  management systems from schema and DTD files
-  1.
-
https://people.apache.org/~kkolinko/patches/2014-01-27_tc6_schemas_keywords.patch
-  2. 
-svn propdel svn:keywords --depth files java/javax/servlet/resources
-svn propdel svn:keywords --depth files java/javax/servlet/jsp/resources
-  (backport of r1561706)
-  +1: kkolinko, markt
-  -1:
-  rjung: Is it helpful to remove the old version tags? They carry the 
information
- on which external varion the files were based on.
-
-  kkolinko: To me those tags say nothing and feel misleading, not
- maintained and unmaintainable.
-
- If the annotation says version "1.17 03/18/03", is it really that
- version? If someone prints or copies the file, will such number on
- a printed copy be correct? Unlikely. It feels more that it will
- impersonate the correct "v1.17" that exists elsewhere.
-
- The only reliable way to track history of such file is via its
- actual history (in source code management system or via mail
- archives). The first commit should have said where the file came
- from.
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082
   Concurrency issue in JULI's LogManager
   http://svn.apache.org/r1562748

Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd?rev=1564381&r1=1564380&r2=1564381&view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd Tue Feb  
4 17:13:10 2014
@@ -24,12 +24,6 @@
version="2.0">
   
 
-  @(#)jsp_2_0.xsds 1.17 03/18/03
-
-  
-
-  
-
 
   This is the XML Schema for the JSP 2.0 deployment descriptor
   types.  The JSP 2.0 schema contains all the special

Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
('svn:keywords' removed)

Propchange: 
tomcat/

svn commit: r1564372 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache: ./ catalina/ catalina/ant/ catalina/ant/jmx/ catalina/authenticator/ catalina/connector/ catalina/core/ catalina/deploy/ catalina

[kkolinko]

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardHostMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/CombinedRealm.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/Constants.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LockOutRealm.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/package.html
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings_es.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings_fr.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings_ja.properties
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
('svn:keywords' removed)

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/Constants.java
('svn:keyw

svn commit: r1564368 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: loader/ manager/ manager/host/ mbeans/ realm/ security/ servlets/ session/ ssi/ startup/

[kkolinko]

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java?rev=1564368&r1=1564367&r2=1564368&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserDatabase.java Tue 
Feb  4 16:19:36 2014
@@ -27,7 +27,7 @@ import java.util.Enumeration;
  * current server platform.
  *
  * @author Craig R. McClanahan
- * @version $Id$
+ *
  */
 
 public interface UserDatabase {

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1564368&r1=1564367&r2=1564368&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
Tue Feb  4 16:19:36 2014
@@ -39,7 +39,7 @@ import org.apache.catalina.deploy.Messag
  * classes (/WEB-INF/classes and /WEB-INF/lib).
  *
  * @author Fabien Carrion
- * @version $Id$
+ *
  */
 
 public class WebAnnotationSet {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=1564368&r1=1564367&r2=1564368&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue 
Feb  4 16:19:36 2014
@@ -43,7 +43,7 @@ import org.xml.sax.Attributes;
  * deployment descriptor (/WEB-INF/web.xml) resource.
  *
  * @author Craig R. McClanahan
- * @version $Id$
+ *
  */
 
 public class WebRuleSet extends RuleSetBase {



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

[jira] [Commented] (MTOMCAT-255) Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on tomcat:run but not in tomcat:run-war

[Gilberto C Andrade (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13890803#comment-13890803
 ] 

Gilberto C Andrade commented on MTOMCAT-255:


Hi, Tamal! That's the point of the issue. Have you seen the title?

> Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on 
> tomcat:run but not in tomcat:run-war
> --
>
> Key: MTOMCAT-255
> URL: https://issues.apache.org/jira/browse/MTOMCAT-255
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
> Environment: gilberto.andrade@A37710:~$ mvn -version
> Apache Maven 3.0.4 (r1232337; 2012-01-17 05:44:56-0300)
> Maven home: /home/gilberto.andrade/bin/maven
> Java version: 1.7.0_45, vendor: Oracle Corporation
> Java home: /usr/java/jdk1.7.0_45/jre
> Default locale: pt_BR, platform encoding: UTF-8
> OS name: "linux", version: "3.7.10-1.24-desktop", arch: "amd64", family: 
> "unix"
>Reporter: Gilberto C Andrade
>Assignee: Olivier Lamy (*$^¨%`£)
>Priority: Minor
> Attachments: MTOMCAT-255.zip
>
>
> Simple JSF 2.2 project with just one manage bean(PessoaMb) and one xhtml page.
> 1 Run mvn clean tomcat7:run 
> 2 hitting  http://localhost:8080/MTOMCAT-255/pessoaView.xhtml
> 3 enter some value on field or click the consultar button
> The same steps works when using tomcat7:run-war.



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

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

svn commit: r1564359 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha: ./ deploy/ session/ tcp/ util/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 16:00:06 2014
New Revision: 1564359

URL: http://svn.apache.org/r1564359
Log:
CTR: comments + discussed on dev list
Remove $Id keywords from catalina/ha/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSession.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SendMessageData.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/util/IDynamicProperty.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?rev=1564359&r1=1564358&r2=1564359&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Tue 
Feb  4 16:00:06 2014
@@ -34,7 +34,7 @@ import org.apache.juli.logging.Log;
  * different cluster implementations
  *
  * @author Filip Hanik
- * @version $Id$
+ *
  */
 
 public interface CatalinaCluster extends Cluster {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java?rev=1564359&r1=1564358&r2=1564359&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterDeployer.java Tue 
Feb  4 16:00:06 2014
@@ -22,7 +22,7 @@ package org.apache.catalina.ha;
  * different deployment implementations
  *
  * @author Filip Hanik
- * @version $Id$
+ *
  */
 import org.apache.catalina.LifecycleException;
 import java.io.IOException;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=1564359&r1=1564358&r2=1564359&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java Tue 
Feb  4 16:00:06 2014
@@ -33,7 +33,7 @@ import org.apache.catalina.util.StringMa
  * 
  * @author Peter Rossbach
  * @author Filip Hanik
- * @version $Id$
+ *
  */
 public abstract class ClusterListener implements ChannelListener {
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1564359&r1=1564358&r2=1564359&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Tue 
Feb  4 16:00:06 2014
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.digester.R
  *
  * @author Filip Hanik
  * @author Peter Rossbach
- * @version $Id$
+ *
  */
 
 public class ClusterRuleSet extends RuleSetBase {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catal

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/5470

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1564299
Blamelist: violetagg

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

svn commit: r1564353 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant: ./ jmx/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:44:23 2014
New Revision: 1564353

URL: http://svn.apache.org/r1564353
Log:
CTR: comments + discussed on dev list
Remove $Id, $Revision keywords from catalina/ant/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/InstallTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/JMXGetTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/JMXSetTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ListTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ReloadTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/RemoveTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ResourcesTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/RolesTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ServerinfoTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/SessionsTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/StartTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/StopTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/UndeployTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1564353&r1=1564352&r2=1564353&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
Tue Feb  4 15:44:23 2014
@@ -36,7 +36,7 @@ import org.apache.tools.ant.Project;
  * undeploying applications.  These tasks require Ant 1.4 or later.
  *
  * @author Craig R. McClanahan
- * @version $Id$
+ *
  * @since 4.1
  */
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1564353&r1=1564352&r2=1564353&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java 
Tue Feb  4 15:44:23 2014
@@ -46,7 +46,7 @@ import org.apache.tools.ant.types.Redire
  * 
  *
  * @author Gabriele Garuglieri
- * @version $Id$
+ *
  * @since 5.5
  */
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1564353&r1=1564352&r2=1564353&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java Tue Feb  
4 15:44:23 2014
@@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildExcepti
  * the Tomcat manager application.
  *
  * @author Craig R. McClanahan
- * @version $Id$
+ *
  * @since 4.1
  */
 public class DeployTask extends AbstractCatalinaTask {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/InstallTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/InstallTask.java?rev=1564353&r1=1564352&r2=1564353&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/InstallTask.java 
(original)
+++ tomc

svn commit: r1564350 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote: ./ ajp/ http11/ http11/filters/ memory/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:40:35 2014
New Revision: 1564350

URL: http://svn.apache.org/r1564350
Log:
CTR: comments + discussed on dev list
Remove svn:keywords property from coyote/**

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ActionCode.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ActionHook.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Adapter.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/InputBuffer.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/OutputBuffer.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Processor.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ProtocolHandler.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Request.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/RequestGroupInfo.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/RequestInfo.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Response.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InputFilter.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java  
 (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java 
  (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java  
 (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 
  (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties  
 (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/OutputFilter.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java 
  (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/coyote/memory/MemoryProtocolHandler.java   
(props changed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ActionCode.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0

svn commit: r1564349 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote: ajp/LocalStrings.properties http11/LocalStrings.properties http11/LocalStrings_es.properties http11/LocalStrings_fr.properties h

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:38:49 2014
New Revision: 1564349

URL: http://svn.apache.org/r1564349
Log:
CTR: comments + discussed on dev list
Remove $Id keywords from coyote/**

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1564349&r1=1564348&r2=1564349&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Tue 
Feb  4 15:38:49 2014
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-
 # language 
 
 # package org.apache.coyote.ajp

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1564349&r1=1564348&r2=1564349&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties 
Tue Feb  4 15:38:49 2014
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-
 # language 
 
 # package org.apache.coyote.http11

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties?rev=1564349&r1=1564348&r2=1564349&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties 
Tue Feb  4 15:38:49 2014
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# $Id$
+#
 # language es
 # package org.apache.coyote.http11
 #

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties?rev=1564349&r1=1564348&r2=1564349&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties 
Tue Feb  4 15:38:49 2014
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-
 # language fr
 
 # package org.apache.coyote.http11

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties?rev=1564349&r1=1564348&r2=1564349&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties 
Tue Feb  4 15:38:49 2014
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-
 # language ja
 
 # package org.apache.coyote.http11



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

svn commit: r1564347 - in /tomcat/tc6.0.x/trunk/java/org/apache/el: ./ lang/ parser/ util/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:37:26 2014
New Revision: 1564347

URL: http://svn.apache.org/r1564347
Log:
CTR: comments + discussed on dev list
Remove svn:keywords property from el/**

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/Messages.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/Messages_es.properties   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionLiteral.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionLiteral.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/EvaluationContext.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/VariableMapperImpl.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ArithmeticNode.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstAnd.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstBracketSuffix.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstChoice.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstCompositeExpression.java  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDeferredExpression.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDiv.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDotSuffix.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDynamicExpression.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstEmpty.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstEqual.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFalse.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFunction.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstGreaterThan.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstIdentifier.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstInteger.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLessThan.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLessThanEqual.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMinus.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMod.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMult.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNegative.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNot.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNotEqual.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNull.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstOr.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstPlus.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstString.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstTrue.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstValue.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/BooleanNode.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParserConstants.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/E

Re: Help with updating the Maven Tomcat Plugin

[Konstantin Kolinko]

2014-02-04 Petar Tahchiev :
> Hi guys,
>
> I'm trying to work on
>
> https://issues.apache.org/jira/browse/MTOMCAT-234
>
> Unfortunately the only thing that is left is this: the tomcat-maven-plugin
> uses
> ExternalRepositoriesReloadableWebappLoader to load additional repositories
> in the
> classloader.
>
> ExternalRepositoriesReloadableWebappLoader extends WebappLoader
>
> and WebappLoader implements Loader.
>
> And before tomcat8 the org.apache.catalina.Loader interface had these 2
> methods:
>
> public void addRepository(String repository);
> public String[] findRepositories();
>
>
> so the ExternalRepositoriesReloadableWebappLoader could call
> super.addRepository() and manually add repository.
>
> But I can see in the svn log that since version 1401503 these 2 methods are
> removed (not deperecated, but simply removed). And I can't seem to find any
> possible way to add repository to the loader!
> Can you please guide me what should be the correct way to overcome this.
>

http://tomcat.apache.org/migration-8.html#Web_application_resources
http://tomcat.apache.org/tomcat-8.0-doc/config/resources.html#Nested_Components

Context.getResources() and
http://tomcat.apache.org/tomcat-8.0-doc/api/org/apache/catalina/WebResourceRoot.html

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: r1564345 - in /tomcat/tc6.0.x/trunk/java/org/apache/el: ./ lang/ parser/ util/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:29:20 2014
New Revision: 1564345

URL: http://svn.apache.org/r1564345
Log:
CTR: comments + discussed on dev list
Remove $Id keywords from el/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstAnd.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstBracketSuffix.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstChoice.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstCompositeExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDeferredExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDiv.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDotSuffix.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstDynamicExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstEmpty.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFalse.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstGreaterThan.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLessThan.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLessThanEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMinus.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMod.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstMult.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNot.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNotEqual.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNull.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstOr.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstPlus.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstString.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstTrue.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstValue.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/Node.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/NodeVisitor.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/tc6.0.x/trunk/java/org/apache/el/util/MessageFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=1564345&r1=1564344&r2=1564345&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/ExpressionFactoryImpl.java Tue Feb  
4 15:29:20 2014
@@ -31,7 +31,7 @@ import org.apache.el.util.MessageFactory
  * @see javax.el.ExpressionFactory
  * 
  * @author Jacob Hookom [ja...@hookom.net]
- * @version $Id$
+ *
  */
 public class ExpressionFactoryImpl extends ExpressionFactory {
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1564345&r1=1564344&r2=1564345&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java Tue Feb  
4 15:29:20 2014
@@ -75,7 +75,7 @@ import org.apache.el.util.ReflectionUtil
  * @see javax.el.MethodExpression
  * 
  * @author Jacob Hookom [ja...@hookom.net]
- * @version $Id$
+ *
  */
 public final class MethodExpressionImpl extends MethodExpression implements
 Externalizable {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/e

svn commit: r1564344 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ el/ resources/ runtime/ security/ servlet/ tagplugins/jstl/ tagplugins/jstl/core/ util/ xmlpars

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:26:04 2014
New Revision: 1564344

URL: http://svn.apache.org/r1564344
Log:
CTR: comments + discussed on dev list
Remove svn:keywords property from jasper/**

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JasperException.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Options.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/BeanRepository.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Collector.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java   (props 
changed)

tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Dumper.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELNode.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ErrorHandler.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Localizer.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Mark.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Node.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java  
 (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ServletWriter.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapGenerator.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapStratum.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagConstants.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java  
 (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java  
 (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TextOptimizer.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ELContextImpl.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ELContextWrapper.java   
(props changed)
tomcat/tc6.0.x/trunk/java/o

Help with updating the Maven Tomcat Plugin

[Petar Tahchiev]

Hi guys,

I'm trying to work on

https://issues.apache.org/jira/browse/MTOMCAT-234

Unfortunately the only thing that is left is this: the tomcat-maven-plugin
uses
ExternalRepositoriesReloadableWebappLoader to load additional repositories
in the
classloader.

ExternalRepositoriesReloadableWebappLoader extends WebappLoader

and WebappLoader implements Loader.

And before tomcat8 the org.apache.catalina.Loader interface had these 2
methods:

public void addRepository(String repository);
public String[] findRepositories();


so the ExternalRepositoriesReloadableWebappLoader could call
super.addRepository() and manually add repository.

But I can see in the svn log that since version 1401503 these 2 methods are
removed (not deperecated, but simply removed). And I can't seem to find any
possible way to add repository to the loader!
Can you please guide me what should be the correct way to overcome this.

Thanks.

-- 
Regards, Petar!
Karlovo, Bulgaria.
---
Public PGP Key at:
https://keyserver1.pgp.com/vkd/DownloadKey.event?keyid=0x19658550C3110611
Key Fingerprint: A369 A7EE 61BC 93A3 CDFF  55A5 1965 8550 C311 0611

svn commit: r1564343 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: compiler/ resources/ runtime/ util/ xmlparser/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:22:22 2014
New Revision: 1564343

URL: http://svn.apache.org/r1564343
Log:
CTR: comments + discussed on dev list
Remove $Id, $Revision keywords from jasper/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/util/Enumerator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/XMLString.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1564343&r1=1564342&r2=1564343&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
Tue Feb  4 15:22:22 2014
@@ -53,7 +53,7 @@ import org.apache.juli.logging.LogFactor
  * Only used if a web application context is a directory.
  *
  * @author Glenn L. Nielsen
- * @version $Revision$
+ *
  */
 public final class JspRuntimeContext {
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1564343&r1=1564342&r2=1564343&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Tue Feb  4 15:22:22 2014
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-#
 # Default localized string information
 # Localized this the Default Locale as is en_US
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1564343&r1=1564342&r2=1564343&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 Tue Feb  4 15:22:22 2014
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# $Id$
 #
 # Default localized string information
 # Localized para Locale es_ES

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1564343&r1=1564342&r2=1564343&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 Tue Feb  4 15:22:22 2014
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# $Id$
-#
 # Default localized string information
 # Localized this the Default Locale as is fr_FR
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1564343&r1=1564342&r2=1564343&view=diff

svn commit: r1564339 - in /tomcat/tc6.0.x/trunk/java/org/apache/juli: ./ logging/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:16:56 2014
New Revision: 1564339

URL: http://svn.apache.org/r1564339
Log:
CTR: comments + discussed on dev list
Remove $Id keywords and svn:keywords property from juli/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java   (contents, 
props changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java   (contents, 
props changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/OneLineFormatter.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java   (contents, 
props changed)

tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
   (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html   (props 
changed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
('svn:keywords' removed)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java?rev=1564339&r1=1564338&r2=1564339&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java Tue Feb  4 
15:16:56 2014
@@ -41,7 +41,7 @@ import java.util.TimeZone;
  * The cache can be created with a parent cache to build a cache hierarchy.
  * Access to the parent cache is threadsafe.
  *
- * @version $Id$
+ *
  */
 
 public class DateFormatCache {

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/DateFormatCache.java
('svn:keywords' removed)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=1564339&r1=1564338&r2=1564339&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Tue Feb  4 
15:16:56 2014
@@ -76,7 +76,7 @@ import java.util.logging.SimpleFormatter
  *java.util.logging.SimpleFormatter
  * 
  *
- * @version $Id$
+ *
  */
 
 public class FileHandler

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/OneLineFormatter.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java
('svn:keywords' removed)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java?rev=1564339&r1=1564338&r2=1564339&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java Tue Feb  4 
15:16:56 2014
@@ -58,7 +58,7 @@ package org.apache.juli.logging;
  *
  * @author mailto:sand...@apache.org";>Scott Sanders
  * @author Rod Waldhoff
- * @version $Id$
+ *
  */
 public interface Log {
 

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java
('svn:keywords' removed)

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java?rev=1564339&r1=1564338&r2=1564339&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
 Tue Feb  4 15:16:56 2014
@@ -24,7 +24,7 @@ package org.apache.juli.logging;
  * factory methods.
  *
  * @author Craig R. McClanahan
- * @version $Id$
+ *
  */
 
 public class LogConfigurationException extends RuntimeException {

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java
('svn:keywords' removed)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/ap

svn commit: r1564340 - in /tomcat/tc6.0.x/trunk/java/org/apache/jk: ./ apr/ common/ config/ core/ server/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:19:57 2014
New Revision: 1564340

URL: http://svn.apache.org/r1564340
Log:
CTR: comments + discussed on dev list
Remove keywords and svn:keywords property from jk/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jk/apr/AprImpl.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/apr/TomcatStarter.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/AjpConstants.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelJni.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelShm.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerDispatch.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkMX.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/Shm.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/Shm14.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/WorkerDummy.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/BaseJkConfig.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/GeneratorApache2.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/GeneratorJk1.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/GeneratorJk2.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/IISConfig.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/NSConfig.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/WebXml2Jk.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkChannel.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/Msg.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/WorkerEnv.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/package.html   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/mbeans-descriptors.xml   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java   (props changed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/apr/AprImpl.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/apr/TomcatStarter.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/AjpConstants.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelJni.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelShm.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerDispatch.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkMX.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/Shm.java
('svn:keywords' removed)

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/Shm14.java
('svn:keywords' removed)

Propc

svn commit: r1564337 - in /tomcat/tc6.0.x/trunk/java/org/apache/naming: ./ factory/ factory/webservices/ java/ resources/ resources/jndi/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:15:17 2014
New Revision: 1564337

URL: http://svn.apache.org/r1564337
Log:
CTR: comments + discussed on dev list
Remove svn:keywords property from naming/**

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/Constants.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/HandlerRef.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_es.properties   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_fr.properties   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_ja.properties   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/NameParserImpl.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java   (props 
changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContextEnumeration.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingEntry.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingService.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingServiceMBean.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceEnvRef.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceLinkRef.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceRef.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/ServiceRef.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/StringManager.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/TransactionRef.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/Constants.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/MailSessionFactory.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/OpenEjbFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/SendMailFactory.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/TransactionFactory.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/package.html   (props 
changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/java/javaURLContextFactory.java 
  (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/java/package.html   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/package.html   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/CacheEntry.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/Constants.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_es.properties
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties
   (props changed)
   

svn commit: r1564334 - in /tomcat/tc6.0.x/trunk/java/org/apache/naming: ./ factory/ java/ resources/ resources/jndi/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:12:41 2014
New Revision: 1564334

URL: http://svn.apache.org/r1564334
Log:
CTR: comments + discussed on dev list
Remove $Id, $Revision keywords from naming/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/JndiPermission.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/naming/NameParserImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContextEnumeration.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingEntry.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingService.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingServiceMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/ResourceRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/TransactionRef.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/MailSessionFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/factory/TransactionFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/java/javaURLContextFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/CacheEntry.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ProxyDirContext.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/Resource.java

tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ResourceAttributes.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/ResourceCache.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/jndi/Handler.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java?rev=1564334&r1=1564333&r2=1564334&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextAccessController.java 
Tue Feb  4 15:12:41 2014
@@ -24,7 +24,7 @@ import java.util.Hashtable;
  * Handles the access control on the JNDI contexts.
  *
  * @author Remy Maucherat
- * @version $Id$
+ *
  */
 
 public class ContextAccessController {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java?rev=1564334&r1=1564333&r2=1564334&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/ContextBindings.java Tue Feb  4 
15:12:41 2014
@@ -30,7 +30,7 @@ import javax.naming.Context;
  * 
  *
  * @author Remy Maucherat
- * @version $Id$
+ *
  */
 
 public class ContextBindings {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java?rev=1564334&r1=1564333&r2=1564334&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/EjbRef.java

svn commit: r1564330 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat: ./ buildutil/ jni/ util/ util/buf/ util/buf/res/ util/collections/ util/descriptor/ util/http/ util/http/fileupload/ util/http/m

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 15:00:34 2014
New Revision: 1564330

URL: http://svn.apache.org/r1564330
Log:
CTR: comments + discussed on dev list
Remove svn:keywords property from tomcat/**

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/Apr.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/apr.properties   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/DateTool.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/TimeStamp.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java   (props 
changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UTF8Decoder.java   
(props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/package.html   (props 
changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings.properties
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
   (props changed)
 

svn commit: r1564325 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat: jni/ util/buf/ util/http/ util/http/fileupload/ util/modeler/ util/net/ util/res/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 14:53:22 2014
New Revision: 1564325

URL: http://svn.apache.org/r1564325
Log:
CTR: comments + discussed on dev list
Remove $Id, $Revision keywords from tomcat/**
I am replacing @version with an empty line, to preserve line numbers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/BaseRequest.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItem.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItemFactory.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package.html

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java?rev=1564325&r1=1564324&r2=1564325&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java Tue Feb  4 
14:53:22 2014
@@ -20,7 +20,7 @@ package org.apache.tomcat.jni;
 /** Address
  *
  * @author Mladen Turk
- * @version $Id$
+ *
  */
 
 public class Address {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java?rev=1564325&r1=1564324&r2=1564325&view=diff
=

svn commit: r1564323 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 14:45:37 2014
New Revision: 1564323

URL: http://svn.apache.org/r1564323
Log:
CTR: comments + discussed on dev list
Remove $Id keyword and svn:keywords property from tomcat/util/digester/**

Here '$Id$' was in the license header.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
   (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
   (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java   
(contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java   
(contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java   
(props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
   (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java   
(contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java   
(contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java 
  (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
   (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectParamRule.java  
 (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java
   (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/PathCallParamRule.java
   (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Rule.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/RuleSet.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java  
 (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Rules.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java   
(contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java  
 (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
   (contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java  
 (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java  
 (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java   
(contents, props changed)

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java
   (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java 
  (contents, props changed)
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/package.html   
(props changed)

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java?rev=1564323&r1=1564322&r2=1564323&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
 Tue Feb  4 14:45:37 2014
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * 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.

Propchange: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
('svn:keywords' removed)

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java?rev=1564323&r1=1564322&r2=1564323&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
 Tue Feb  4 14:45:37 2014
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional info

svn commit: r1564320 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/tribes/io/XByteBuffer.java java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 14:32:46 2014
New Revision: 1564320

URL: http://svn.apache.org/r1564320
Log:
CTR: Javadoc fixes (reviewing r1561778, r1561773)

Merged r1564317 from tomcat/tc7.0.x/trunk:
Fix markup: do not include unrelated text into the value of @version, @param.
Fix typo and unclosed  tag

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Propchange: tomcat/tc6.0.x/trunk/
--
  Merged /tomcat/trunk:r1564309,1564312
  Merged /tomcat/tc7.0.x/trunk:r1564317

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1564320&r1=1564319&r2=1564320&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java 
Tue Feb  4 14:32:46 2014
@@ -90,7 +90,8 @@ public class XByteBuffer
 protected boolean discard = true;
 
 /**
- * Constructs a new XByteBuffer
+ * Constructs a new XByteBuffer.
+ * TODO use a pool of byte[] for performance
  * @param size - the initial size of the byte buffer
  *
  * TODO use a pool of byte[] for performance

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1564320&r1=1564319&r2=1564320&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
Tue Feb  4 14:32:46 2014
@@ -41,16 +41,14 @@ import org.apache.catalina.tribes.tipis.
  * each time the object gets replicated the entire object gets serialized, 
hence a call to replicate(true)
  * will replicate all objects in this map that are using this node as primary.
  *
- * REMBER TO CALL breakdown() or 
finalize() when you are done with the map to
- * avoid memory leaks.
- * 
+ * REMEMBER TO CALL breakdown() or 
finalize()
+ * when you are done with the map to avoid memory leaks.
+ * TODO implement periodic sync/transfer thread
+ * TODO memberDisappeared, should do nothing except change map membership
+ *   by default it relocates the primary objects
+ *
  * @author Filip Hanik
  * @version 1.0
- * 
- * TODO implement periodic sync/transfer thread
- * 
- * TODO memberDisappeared, should do nothing except change map membership
- *  by default it relocates the primary objects
  */
 public class ReplicatedMap extends AbstractReplicatedMap implements 
RpcCallback, ChannelListener, MembershipListener {
 



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

svn commit: r1564317 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/io/XByteBuffer.java java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 14:23:53 2014
New Revision: 1564317

URL: http://svn.apache.org/r1564317
Log:
Merged revisions r1564309, r1564312 from tomcat/trunk:
Fix javadoc markup (reviewing r1561778, r1561773).
Do not include unrelated text into the value of @version, @param.
Fix typo and unclosed  tag

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1564309,1564312

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1564317&r1=1564316&r2=1564317&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java 
Tue Feb  4 14:23:53 2014
@@ -80,9 +80,9 @@ public class XByteBuffer
 protected boolean discard = true;
 
 /**
- * Constructs a new XByteBuffer
- * @param size - the initial size of the byte buffer
+ * Constructs a new XByteBuffer.
  * TODO use a pool of byte[] for performance
+ * @param size - the initial size of the byte buffer
  */
 public XByteBuffer(int size, boolean discard) {
 buf = new byte[size];

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1564317&r1=1564316&r2=1564317&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
Tue Feb  4 14:23:53 2014
@@ -37,14 +37,14 @@ import org.apache.catalina.tribes.Member
  * each time the object gets replicated the entire object gets serialized, 
hence a call to replicate(true)
  * will replicate all objects in this map that are using this node as primary.
  *
- * REMBER TO CALL breakdown() or 
finalize() when you are done with the map to
- * avoid memory leaks.
- * TODO implement periodic sync/transfer thread
- * @author Filip Hanik
- * @version 1.0
- * 
+ * REMEMBER TO CALL breakdown() or 
finalize()
+ * when you are done with the map to avoid memory leaks.
+ * TODO implement periodic sync/transfer thread
  * TODO memberDisappeared, should do nothing except change map membership
  *   by default it relocates the primary objects
+ *
+ * @author Filip Hanik
+ * @version 1.0
  */
 public class ReplicatedMap extends AbstractReplicatedMap {
 



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

svn commit: r1564312 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 14:21:21 2014
New Revision: 1564312

URL: http://svn.apache.org/r1564312
Log:
Javadoc: fix typo and unclosed  tag

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1564312&r1=1564311&r2=1564312&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue 
Feb  4 14:21:21 2014
@@ -37,8 +37,8 @@ import org.apache.catalina.tribes.Member
  * each time the object gets replicated the entire object gets serialized, 
hence a call to replicate(true)
  * will replicate all objects in this map that are using this node as primary.
  *
- * REMBER TO CALL breakdown() or 
finalize() when you are done with the map to
- * avoid memory leaks.
+ * REMEMBER TO CALL breakdown() or 
finalize()
+ * when you are done with the map to avoid memory leaks.
  * TODO implement periodic sync/transfer thread
  * TODO memberDisappeared, should do nothing except change map membership
  *   by default it relocates the primary objects



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

svn commit: r1564309 - in /tomcat/trunk/java/org/apache/catalina/tribes: io/XByteBuffer.java tipis/ReplicatedMap.java

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 14:16:22 2014
New Revision: 1564309

URL: http://svn.apache.org/r1564309
Log:
Fix javadoc markup (reviewing r1561778, r1561773).
Do not include unrelated text into the value of @version, @param.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1564309&r1=1564308&r2=1564309&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue Feb  4 
14:16:22 2014
@@ -79,9 +79,9 @@ public class XByteBuffer
 protected boolean discard = true;
 
 /**
- * Constructs a new XByteBuffer
- * @param size - the initial size of the byte buffer
+ * Constructs a new XByteBuffer.
  * TODO use a pool of byte[] for performance
+ * @param size - the initial size of the byte buffer
  */
 public XByteBuffer(int size, boolean discard) {
 buf = new byte[size];

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1564309&r1=1564308&r2=1564309&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue 
Feb  4 14:16:22 2014
@@ -39,11 +39,11 @@ import org.apache.catalina.tribes.Member
  *
  * REMBER TO CALL breakdown() or 
finalize() when you are done with the map to
  * avoid memory leaks.
- * TODO implement periodic sync/transfer thread
- * @version 1.0
- *
+ * TODO implement periodic sync/transfer thread
  * TODO memberDisappeared, should do nothing except change map membership
  *   by default it relocates the primary objects
+ *
+ * @version 1.0
  */
 public class ReplicatedMap extends AbstractReplicatedMap {
 



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

svn commit: r1564299 - /tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

[violetagg]

Author: violetagg
Date: Tue Feb  4 13:50:53 2014
New Revision: 1564299

URL: http://svn.apache.org/r1564299
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56096
When creating JMXConnectorServer use the correct rmiBindAddress. Patch provided 
by Jim Talbut.

Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

Modified: 
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1564299&r1=1564298&r2=1564299&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 
Tue Feb  4 13:50:53 2014
@@ -256,7 +256,7 @@ public class JmxRemoteLifecycleListener 
 
 
 // Create the Platform server
-csPlatform = createServer("Platform", rmiRegistryPortPlatform,
+csPlatform = createServer("Platform", rmiBindAddress, 
rmiRegistryPortPlatform,
 rmiServerPortPlatform, env, csf, ssf,
 ManagementFactory.getPlatformMBeanServer());
 
@@ -266,7 +266,7 @@ public class JmxRemoteLifecycleListener 
 }
 
 private JMXConnectorServer createServer(String serverName,
-int theRmiRegistryPort, int theRmiServerPort,
+String bindAddress, int theRmiRegistryPort, int theRmiServerPort,
 HashMap theEnv, RMIClientSocketFactory csf,
 RMIServerSocketFactory ssf, MBeanServer theMBeanServer) {
 
@@ -280,11 +280,19 @@ public class JmxRemoteLifecycleListener 
 return null;
 }
 
+if (bindAddress == null) {
+bindAddress = "localhost";
+}
+
 // Build the connection string with fixed ports
 StringBuilder url = new StringBuilder();
-url.append("service:jmx:rmi://localhost:");
+url.append("service:jmx:rmi://");
+url.append(bindAddress);
+url.append(":");
 url.append(theRmiServerPort);
-url.append("/jndi/rmi://localhost:");
+url.append("/jndi/rmi://");
+url.append(bindAddress);
+url.append(":");
 url.append(theRmiRegistryPort);
 url.append("/jmxrmi");
 JMXServiceURL serviceUrl;



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

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

[kkolinko]

Author: kkolinko
Date: Tue Feb  4 13:19:27 2014
New Revision: 1564285

URL: http://svn.apache.org/r1564285
Log:
vote

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=1564285&r1=1564284&r2=1564285&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb  4 13:19:27 2014
@@ -57,7 +57,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082
   Concurrency issue in JULI's LogManager
   http://svn.apache.org/r1562748
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 



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

[jira] [Commented] (MTOMCAT-255) Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on tomcat:run but not in tomcat:run-war

[Tamal Kanti Nath (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13890603#comment-13890603
 ] 

Tamal Kanti Nath commented on MTOMCAT-255:
--

Hi, I am also getting the same problem. As a work-around, I am using: 
tomcat:run-war instead of tomcat:run.

> Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on 
> tomcat:run but not in tomcat:run-war
> --
>
> Key: MTOMCAT-255
> URL: https://issues.apache.org/jira/browse/MTOMCAT-255
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
> Environment: gilberto.andrade@A37710:~$ mvn -version
> Apache Maven 3.0.4 (r1232337; 2012-01-17 05:44:56-0300)
> Maven home: /home/gilberto.andrade/bin/maven
> Java version: 1.7.0_45, vendor: Oracle Corporation
> Java home: /usr/java/jdk1.7.0_45/jre
> Default locale: pt_BR, platform encoding: UTF-8
> OS name: "linux", version: "3.7.10-1.24-desktop", arch: "amd64", family: 
> "unix"
>Reporter: Gilberto C Andrade
>Assignee: Olivier Lamy (*$^¨%`£)
>Priority: Minor
> Attachments: MTOMCAT-255.zip
>
>
> Simple JSF 2.2 project with just one manage bean(PessoaMb) and one xhtml page.
> 1 Run mvn clean tomcat7:run 
> 2 hitting  http://localhost:8080/MTOMCAT-255/pessoaView.xhtml
> 3 enter some value on field or click the consultar button
> The same steps works when using tomcat7:run-war.



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

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

JDK 8 Build 128 is available on java.net

[Rory O'Donnell Oracle, Dublin Ireland]

Hi Mladen,

JDK 8 Build b128 Early Access Build is now available for download 
 & test.

Please log all show stopper issues as soon as possible.

I would encourage you to read another interesting blog by Eric Costlow 
regarding
 JDK 8 using TLS 1.2 as default 
 
. This first occurred in build 122, please do let me

know if you uncover any issues.

Thanks for your support, Rory

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

[Bug 56104] Provide new Icon for tomcat 8 and change installation welcome image

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56104

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
 OS||All

--- Comment #1 from Mark Thomas  ---
I've fixed the welcome page. That will be corrected for 8.0.2 onwards.

The icons are currently consistent across all Tomcat versions. I'm not
convinced of the benefits of changing them. Maybe it would be possible to add
the major version number but I'm not sure how readable that would be.

-- 
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

svn commit: r1564246 - in /tomcat/trunk: res/side_left.bmp webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Feb  4 10:28:48 2014
New Revision: 1564246

URL: http://svn.apache.org/r1564246
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56104
Correct the version number for the installer

Modified:
tomcat/trunk/res/side_left.bmp
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/res/side_left.bmp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/side_left.bmp?rev=1564246&r1=1564245&r2=1564246&view=diff
==
Binary files - no diff available.

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564246&r1=1564245&r2=1564246&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Feb  4 10:28:48 2014
@@ -82,6 +82,14 @@
   
 
   
+  
+
+  
+56104: Correct the version number on the welcome page of the
+Windows installer. (markt)
+  
+
+  
 
 
   



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

[Bug 56104] New: Provide new Icon for tomcat 8 and change installation welcome image

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56104

Bug ID: 56104
   Summary: Provide new Icon for tomcat 8 and change installation
welcome image
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: gold_n...@hotmail.com

Welcome Image of Tomcat 8 Installation contains "Apache Tomcat 7" (See
attachment).

I recommended to change it to "Apache Tomcat 8"
and it will be nice to have new icon/new welcome image for tomcat 8 so we can
distinguish between the server.

-- 
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

svn commit: r1564233 - /tomcat/trunk/build.properties.default

[markt]

Author: markt
Date: Tue Feb  4 09:19:03 2014
New Revision: 1564233

URL: http://svn.apache.org/r1564233
Log:
Keep up with DBCP2

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1564233&r1=1564232&r2=1564233&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Feb  4 09:19:03 2014
@@ -153,7 +153,7 @@ tomcat-native.win.2=${base-tomcat.loc.2}
 #commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
 
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
 
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20140203.073545-156
+commons-dbcp.version=2.0-20140204.023716-160
 commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
 
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
 
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz



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