date:20141016

Re: Summary: Migration from svn to git

2014-10-16 Thread Martin Grigorov

Hi,

On Thu, Oct 16, 2014 at 9:38 PM, Konstantin Kolinko 
wrote:

> Just several technical notes,
>
>

> If anyone wants to comment on Github, I think that it is already
> possible. I think that it works and the messages are forwarded to the
> dev list.
>
>
Unfortunately this is not true.
At the moment notifications for comments on a commit in GitHub mirror are
being sent only to the committer of this particular commit.


>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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

2014-10-16 Thread 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-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 7 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-test-apr :  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-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 25 mins 25 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141017-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar
 -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141017/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141017.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141017-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false
  
-Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141017/bin/openssl
 -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141017.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-j

[Bug 57103] New: Download page should provide details on how to verify the downloads

2014-10-16 Thread bugzilla

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

Bug ID: 57103
   Summary: Download page should provide details on how to verify
the downloads
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Mac OS X 10.4
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: s...@apache.org

The download page has a section on release integrity but does not detail how to
perform the check.

The page should either include the information, or provide a link to a generic
page with the info.

[The httpd download page has both]

-- 
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 57103] Download page should provide details on how to verify the downloads

2014-10-16 Thread bugzilla

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

Sebb  changed:

   What|Removed |Added

URL||http://tomcat.apache.org/do
   ||wnload-80.cgi

-- 
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 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]

2014-10-16 Thread bugzilla

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

Neale Rudd  changed:

   What|Removed |Added

 CC||ne...@metawerx.net

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

buildbot success in ASF Buildbot on tomcat-trunk

2014-10-16 Thread 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/555

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1632425
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot




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

[Bug 57102] Cannot Specify sslEnabledProtocols

2014-10-16 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
Bugzilla is not a support forum. Please use the users mailing list.

-- 
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 57102] New: Cannot Specify sslEnabledProtocols

2014-10-16 Thread bugzilla

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

Bug ID: 57102
   Summary: Cannot Specify sslEnabledProtocols
   Product: Tomcat 6
   Version: 6.0.41
  Hardware: PC
OS: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: jschw...@gmail.com

I'm attempting to disable SSLv3 by specifying the
sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2" in my HTTP connector, but it is not
disabling it. Looking at catalina.out I see this logged warning:

WARNING: [SetAllPropertiesRule]{Server/Service/Connector} Setting property
'sslEnabledProtocols' to 'TLSv1,TLSv1.1,TLSv1.2' did not find a matching
property.

The host is running tomcat 6.0.41 with Java 7u65.

-- 
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 53952] Add support for TLS 1.1 and 1.2

2014-10-16 Thread bugzilla

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

--- Comment #34 from Christopher Schultz  ---
(In reply to jfclere from comment #31)
> Created attachment 32114 [details]
> patch for the issue.
> 
> The patch works for me.
> Basically the SSL.java needs the new SSL_PROTOCOL_TLS11 and
> SSL_PROTOCOL_TLS12 and add to ALL.
> 
> To set the protocol I have set it to SSL.SSL_PROTOCOL_ALL; and use
> !protocol.contains("java name") to allow support the java syntax for
> protocol.

To be clear, this also requires a patch to tcnative as well.

Sounds like it's time to pull the trigger on this.

-- 
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 57079] Use Tomcat version number in jdbc-pool manifest when building it as part of Tomcat

2014-10-16 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in 8.0.x for 8.0.15 onwards.

Using the Tomcat version number makes sense to me when shipping as part of
Tomcat.

Since the version numbers are not over-lapping, this shouldn't cause any
problems.

-- 
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: r1632425 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 19:46:19 2014
New Revision: 1632425

URL: http://svn.apache.org/r1632425
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57079
 Use Tomcat version number for jdbc-pool module when building and shipping the 
module as part of Tomcat.

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

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1632425&r1=1632424&r2=1632425&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Oct 16 19:46:19 2014
@@ -1099,6 +1099,9 @@
   
   
   
+  
+  
+  
 
 
   

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1632425&r1=1632424&r2=1632425&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 16 19:46:19 2014
@@ -235,6 +235,10 @@
 57005: Fix javadoc errors when building with Java 8. Patch
 provided by Pierre Viret. (markt)
   
+  
+57079: Use Tomcat version number for jdbc-pool module when
+building and shipping the module as part of Tomcat. (markt)
+  
 
   
   



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

svn commit: r1632424 - /tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 19:44:43 2014
New Revision: 1632424

URL: http://svn.apache.org/r1632424
Log:
Remove "Created-By"
Build process will add this (with the correct value) automatically.

Modified:
tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF

Modified: tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF?rev=1632424&r1=1632423&r2=1632424&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF (original)
+++ tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF Thu Oct 16 19:44:43 
2014
@@ -12,7 +12,6 @@ Bundle-Vendor: Apache Software Foundatio
 Bundle-Version: @VERSION@
 Bundle-Name: Apache Tomcat JDBC Connection Pool
 Bundle-ManifestVersion: 2
-Created-By: 11.0-b16 (Sun Microsystems Inc.)
 Bundle-SymbolicName: org.apache.tomcat.jdbc
 Import-Package: 
   javax.management;version="0",



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

svn commit: r1632423 - /tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 19:41:20 2014
New Revision: 1632423

URL: http://svn.apache.org/r1632423
Log:
Remove Ant hard-coded version.
Ant will add the correct version automatically.

Modified:
tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF

Modified: tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF?rev=1632423&r1=1632422&r2=1632423&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF (original)
+++ tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF Thu Oct 16 19:41:20 
2014
@@ -8,7 +8,6 @@ Export-Package: org.apache.tomcat.jdbc.n
  .logging,javax.management.openmbean,javax.management";version="@VERSION@
  ",org.apache.tomcat.jdbc.pool.jmx;uses:="org.apache.tomcat.jdbc.pool,or
  g.apache.juli.logging,javax.management";version="@VERSION@"
-Ant-Version: Apache Ant 1.7.0
 Bundle-Vendor: Apache Software Foundation
 Bundle-Version: @VERSION@
 Bundle-Name: Apache Tomcat JDBC Connection Pool



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

[Bug 57089] Configuration of element is lost on reload

2014-10-16 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
This has been fixed in 8.0.x and will be included in 8.0.15 onwards.

-- 
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: r1632411 - in /tomcat/trunk: java/org/apache/catalina/session/ManagerBase.java java/org/apache/catalina/util/SessionIdGeneratorBase.java webapps/docs/changelog.xml

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 19:01:35 2014
New Revision: 1632411

URL: http://svn.apache.org/r1632411
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57089
Ensure that configuration of a session ID generator is not lost when a web 
application is reloaded.

Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1632411&r1=1632410&r2=1632411&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Oct 16 
19:01:35 2014
@@ -36,6 +36,7 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
+import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
@@ -615,17 +616,23 @@ public abstract class ManagerBase extend
 sig.setSecureRandomProvider(getSecureRandomProvider());
 }
 
-// Force initialization of the random number generator
-if (log.isDebugEnabled())
-log.debug("Force random number initialization starting");
-sessionIdGenerator.generateSessionId();
-if (log.isDebugEnabled())
-log.debug("Force random number initialization completed");
+if (sessionIdGenerator instanceof Lifecycle) {
+((Lifecycle) sessionIdGenerator).start();
+} else {
+// Force initialization of the random number generator
+if (log.isDebugEnabled())
+log.debug("Force random number initialization starting");
+sessionIdGenerator.generateSessionId();
+if (log.isDebugEnabled())
+log.debug("Force random number initialization completed");
+}
 }
 
 @Override
 protected void stopInternal() throws LifecycleException {
-this.sessionIdGenerator = null;
+if (sessionIdGenerator instanceof Lifecycle) {
+((Lifecycle) sessionIdGenerator).stop();
+}
 }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1632411&r1=1632410&r2=1632411&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java Thu 
Oct 16 19:01:35 2014
@@ -22,12 +22,15 @@ import java.security.SecureRandom;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
 import org.apache.catalina.SessionIdGenerator;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;
 
-public abstract class SessionIdGeneratorBase implements SessionIdGenerator {
+public abstract class SessionIdGeneratorBase extends LifecycleBase
+implements SessionIdGenerator {
 
 private static final Log log = 
LogFactory.getLog(SessionIdGeneratorBase.class);
 
@@ -239,4 +242,32 @@ public abstract class SessionIdGenerator
 result.getAlgorithm(), Long.valueOf(t2-t1)));
 return result;
 }
+
+
+@Override
+protected void initInternal() throws LifecycleException {
+// NO-OP
+}
+
+
+@Override
+protected void startInternal() throws LifecycleException {
+// Ensure SecureRandom has been initialised
+generateSessionId();
+
+setState(LifecycleState.STARTING);
+}
+
+
+@Override
+protected void stopInternal() throws LifecycleException {
+setState(LifecycleState.STOPPING);
+randoms.clear();
+}
+
+
+@Override
+protected void destroyInternal() throws LifecycleException {
+// NO-OP
+}
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1632411&r1=1632410&r2=1632411&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 16 19:01:35 2014
@@ -150,6 +150,10 @@
 resource. The context.xml having an external docBase has already been
 registered as a redeploy resource at first. (kfujino)
   
+  
+57089: Ens

Re: Summary: Migration from svn to git

2014-10-16 Thread Mark Thomas

On 16/10/2014 18:46, Konstantin Kolinko wrote:
> 2014-10-16 21:23 GMT+04:00 Mark Thomas :
>> On 07/10/2014 15:14, Mark Thomas wrote:
>>> The following is a summary of the previous discussions and the concerns
>>> raised. It is an attempt to get all the information in one place so we
>>> can agree on whether or not we want to migrate to git.
>>
>> Given the lack of feedback on this thread, my working assumption is that
>> the consensus opinion is not to migrate to git at this time.
> 
> Agreed.
> 
> The current svn+git approach is working, and I see what will be missed
> and broken if we migrated to git only.
> 
> At the same time, we still need svn for the web site and binaries.
> 
>> Therefore,
>> I intend to create the 9.0.x branch (using the same structure in svn as
>> previously) at the same time as I create the next 8.0.x tag.
>>
> 
> I guess that you mean to create "8.0.x" branch with "svn cp trunk
> ../tc8.0.x/trunk" and to start treating trunk as 9.0.x. Or did you
> mean something different?

Nope, that is what I meant.

> Do you have specific plans for Tomcat 9 to start diverge from Tomcat 8?

Brain dump follows. No particular order.

Remove BIO.
Remove Comet.
More refactoring of the connectors with the aim of getting all the per
implementation code into the Endpoint.
Switch build to Java 8.
SNI support for JSSE.
See what Java 8 language features we want to use.
Start thinking about any internal refactoring required for HTTP2/SPDY
APIs that might be exposed in the Servlet API.
Keep an eye on the other Java EE 8 EGs (no sign of any movement apart
from the Servlet EG so far).
Refactor WebSocket I/O to go directly to Tomcat's internals rather than
via the Servlet API.

> BTW, 6.0.42 release candidate is still being voted on, lacking the third vote.

I assumed that Jean-Frederic would be voting for it as well since he is
the release manager which is why I haven't taken a look.

Mark

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

Re: Summary: Migration from svn to git

2014-10-16 Thread Konstantin Kolinko

Just several technical notes,

2014-10-07 18:14 GMT+04:00 Mark Thomas :

> 2. We would migrate to a two git repo that - initially would have the
> following mapping to the current svn repo:
>tomcat git repo
>  trunk -> master
>  tc7.0.x/trunk -> 7.0.x
>  tc6.0.x/trunk -> 6.0.x
>  tc8.0.x/tags  -> git tags
>  tc7.0.x/tags  -> git tags
>  tc6.0.x/tags  -> git tags

Technically, Subversion tags cannot be represented as git tags. The
git tags point to a revision, but many svn tags have changes relative
to trunk from where they were copied. To account for this difference,
svn-git migrates Subversion tags as git branches.

The above layout also means that Tomcat 5 and earlier sources are not migrated.

By the way,
maybe a svn-git mirror at apache.org could be configured in such way
(the existing one, or a new one)?

>tomcat-native git repo
>  native/trunk  -> master
>  native/branches/1.1.x -> 1.1.x
>  native/branches/tags  -> git tags
>
>   The trunk/bayeux and trunk/tomcat-lite modules would be excluded from
>   the migration
>
(...)

> 6. The configuration diffs used in the migration documentation would be
> provided via GitHub's compare tool

If there is a working solution, maybe add it to the existing page.

Thus far I do not know how to compare subdirectories with that tool.
It compares versions of the whole project.

(Blog about that feature:
https://github.com/blog/612-introducing-github-compare-view

The closest thing that I found is history view for the "conf" directory.
https://github.com/apache/tomcat/commits/trunk/conf/


> 7. Drop reviewboard in favour of commenting on GitHub pull requests.

We can really drop reviewboard now. It is not actually used. There
have been 2 review requests for the whole time, the last being 3 years
ago.

If anyone wants to comment on Github, I think that it is already
possible. I think that it works and the messages are forwarded to the
dev list.


Best regards,
Konstantin Kolinko

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

Re: Summary: Migration from svn to git

2014-10-16 Thread Konstantin Kolinko

2014-10-16 21:23 GMT+04:00 Mark Thomas :
> On 07/10/2014 15:14, Mark Thomas wrote:
>> The following is a summary of the previous discussions and the concerns
>> raised. It is an attempt to get all the information in one place so we
>> can agree on whether or not we want to migrate to git.
>
> Given the lack of feedback on this thread, my working assumption is that
> the consensus opinion is not to migrate to git at this time.

Agreed.

The current svn+git approach is working, and I see what will be missed
and broken if we migrated to git only.

At the same time, we still need svn for the web site and binaries.

> Therefore,
> I intend to create the 9.0.x branch (using the same structure in svn as
> previously) at the same time as I create the next 8.0.x tag.
>

I guess that you mean to create "8.0.x" branch with "svn cp trunk
../tc8.0.x/trunk" and to start treating trunk as 9.0.x. Or did you
mean something different?

Do you have specific plans for Tomcat 9 to start diverge from Tomcat 8?

BTW, 6.0.42 release candidate is still being voted on, lacking the third vote.

Best regards,
Konstantin Kolinko

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

Re: Summary: Migration from svn to git

2014-10-16 Thread Mark Thomas

On 07/10/2014 15:14, Mark Thomas wrote:
> The following is a summary of the previous discussions and the concerns
> raised. It is an attempt to get all the information in one place so we
> can agree on whether or not we want to migrate to git.

Given the lack of feedback on this thread, my working assumption is that
the consensus opinion is not to migrate to git at this time. Therefore,
I intend to create the 9.0.x branch (using the same structure in svn as
previously) at the same time as I create the next 8.0.x tag.

Mark


> 
> 1. This is purely a decision about the version control system we use.
> Other changes to the development process (Ant/Maven/Gradle or
> Bugzilla/Jira) are out of scope for this discussion but free free to
> start another thread to discuss other changes.
> 
> 2. We would migrate to a two git repo that - initially would have the
> following mapping to the current svn repo:
>tomcat git repo
>  trunk -> master
>  tc7.0.x/trunk -> 7.0.x
>  tc6.0.x/trunk -> 6.0.x
>  tc8.0.x/tags  -> git tags
>  tc7.0.x/tags  -> git tags
>  tc6.0.x/tags  -> git tags
>tomcat-native git repo
>  native/trunk  -> master
>  native/branches/1.1.x -> 1.1.x
>  native/branches/tags  -> git tags
> 
>   The trunk/bayeux and trunk/tomcat-lite modules would be excluded from
>   the migration
> 
> 3. site has to remain in svn for now
> 
> 4. archive and sandbox would remain in svn
> 
> 5. Development would take place on master and be cherry-picked to
> branches as required.
> 
> 6. The configuration diffs used in the migration documentation would be
> provided via GitHub's compare too
> 
> 7. Drop reviewboard in favour of commenting on GitHub pull requests.
> 
> 8. The current svn external from native to trunk would be implemented
> using git sub-modules.
> 
> 9. Configure git commit e-mails to include the diff in the body
> 
> 
> 
> The following are still TBD
> 
> 1. mod_jk
>Does it migrate to a third git repo or remain in svn?
> 
> 2. taglibs
>Does it migrate to a third git repo or remain in svn?
> 
> 3. maven-plugin
>Does it migrate to a third git repo or remain in svn?
> 
> 4. sandbox/trunk-maven-layout
>Is there a way for this to continue if we migrate to git?
> 
> 
> I think I have captured everything. Feel free to add things and/or
> respond to the points above so we can see how close we are to consensus.
> 
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

[Bug 53952] Add support for TLS 1.1 and 1.2

2014-10-16 Thread bugzilla

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

--- Comment #33 from jeffrey.jan...@polydyne.com ---
I was looking at the code for the patch in Comment #32 and noticed that you
introduced a regression. SSLv2 was removed from the ALL list sometime back so
that the default was to not support SSLv2. This is also how it is documented on
the Tomcat website.
Please remove SSLv2 from the list of ALL protocols.
Might I suggest that our new default for ALL also not include SSLv3, since it
is now basically a useless protocol?

-- 
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 53952] Add support for TLS 1.1 and 1.2

2014-10-16 Thread bugzilla

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

jfclere  changed:

   What|Removed |Added

 CC||jfcl...@gmail.com

-- 
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 57091] Websockets cannot be used in Windows applet plugin environments based on Oracle Java7

2014-10-16 Thread bugzilla

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

--- Comment #4 from Niklas Hallqvist  ---
Created attachment 32117
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32117&action=edit
A simple websocket client

A simple websocket client test.
Name it se/appli/test/WebsocketClientTest.java
Compile, put in a jar, sign, call it test-signed.jar.
Install it somewhere in a web-catalog along with an html-file like:


  WebsocketClientTest
  

  
  
  

  


Alter the uri-parameter to somewhere a websocket will reply.
Any websocket service that provides a greeting (e.g. an hello world websocket
test) will suffice.

Also install the foloowing jar files in there:

websocket-api.jar
tomcat-websocket.jar
tomcat-util.jar
tomcat-juli.jar

Fire up a browser on a MS Windows box with a JRE7 installed, whcih is trusting
the key you signed the applet with.
Load the HTML file.  Watch the AccessControlException come up in the console.

-- 
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 56397] Establish parallel Maven-based build process

2014-10-16 Thread bugzilla

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

--- Comment #41 from Mark Thomas  ---
Great. The instance starts for me too.

I suspect the issue with JSPs is that Jasper is not getting initialized.

If you look in trunk/res/META-INF you'll see various files that need to be
packaged with the JARs. The important one here is, I suspect, Jasper's SCI.

-- 
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: r1632311 - /tomcat/sandbox/trunk-maven-layout/pom.xml

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 13:54:30 2014
New Revision: 1632311

URL: http://svn.apache.org/r1632311
Log:
Fix failure to start because of missing MBean descriptors. Patch by Pierre Viret

Modified:
tomcat/sandbox/trunk-maven-layout/pom.xml

Modified: tomcat/sandbox/trunk-maven-layout/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/pom.xml?rev=1632311&r1=1632310&r2=1632311&view=diff
==
--- tomcat/sandbox/trunk-maven-layout/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/pom.xml Thu Oct 16 13:54:30 2014
@@ -87,6 +87,12 @@
 src/main/resources
 true
 
+
+src/main/java
+
+**/*.java
+
+
 
 
 



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

svn commit: r1632310 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ webapps/docs/

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 13:48:26 2014
New Revision: 1632310

URL: http://svn.apache.org/r1632310
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57099
Ensure that semi-colons are not permitted in JSP import page directives.

Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestNode.java
  - copied unchanged from r1632307, 
tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java

tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java
  - copied, changed from r1632290, 
tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1632290,1632307

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1632310&r1=1632309&r2=1632310&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java Thu Oct 16 
13:48:26 2014
@@ -601,20 +601,35 @@ abstract class Node implements TagConsta
 int start = 0;
 int index;
 while ((index = value.indexOf(',', start)) != -1) {
-imports.add(value.substring(start, index).trim());
+imports.add(validateImport(value.substring(start, index)));
 start = index + 1;
 }
 if (start == 0) {
 // No comma found
-imports.add(value.trim());
+imports.add(validateImport(value));
 } else {
-imports.add(value.substring(start).trim());
+imports.add(validateImport(value.substring(start)));
 }
 }
 
 public List getImports() {
 return imports;
 }
+
+/**
+ * Just need enough validation to make sure nothing strange is going 
on.
+ * The compiler will validate this thoroughly when it tries to compile
+ * the resulting .java file.
+ */
+private String validateImport(String importEntry) {
+// This should either be a fully-qualified class name or a package
+// name with a wildcard
+if (importEntry.indexOf(';') > -1) {
+throw new IllegalArgumentException(
+Localizer.getMessage("jsp.error.page.invaild.import"));
+}
+return importEntry.trim();
+}
 }
 
 /**

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1632310&r1=1632309&r2=1632310&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Thu Oct 16 13:48:26 2014
@@ -60,6 +60,7 @@ jsp.error.page.conflict.autoflush=Page d
 jsp.error.page.invalid.autoflush=Page directive: invalid value for autoFlush
 jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
+jsp.error.page.invaild.import=Page directive: invalid value for import
 jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of 'info' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.info=Page directive: invalid value for info
 jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of 'isErrorPage' with different values (old: {0}, new: {1})

Copied: 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java 
(from r1632290, 
tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java&p1=tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java&r1=1632290&r2=1632310&rev=1632310&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/co

[Bug 57099] loose parsing of import attribute in page directive screws up SMAP output

2014-10-16 Thread bugzilla

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

--- Comment #2 from Mark Thomas  ---
And also fixed in 7.0.x for 7.0.57 onwards.

-- 
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 57099] loose parsing of import attribute in page directive screws up SMAP output

2014-10-16 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report. This is fixed in 8.0.x for 8.0.15 onwards.

-- 
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: r1632307 - in /tomcat/trunk: java/org/apache/jasper/compiler/Node.java java/org/apache/jasper/resources/LocalStrings.properties test/org/apache/jasper/compiler/TestNode.java webapps/docs/c

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 13:44:18 2014
New Revision: 1632307

URL: http://svn.apache.org/r1632307
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57099
Ensure that semi-colons are not permitted in JSP import page directives.

Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java   (with props)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Node.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Node.java?rev=1632307&r1=1632306&r2=1632307&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Node.java Thu Oct 16 13:44:18 
2014
@@ -583,20 +583,35 @@ abstract class Node implements TagConsta
 int start = 0;
 int index;
 while ((index = value.indexOf(',', start)) != -1) {
-imports.add(value.substring(start, index).trim());
+imports.add(validateImport(value.substring(start, index)));
 start = index + 1;
 }
 if (start == 0) {
 // No comma found
-imports.add(value.trim());
+imports.add(validateImport(value));
 } else {
-imports.add(value.substring(start).trim());
+imports.add(validateImport(value.substring(start)));
 }
 }
 
 public List getImports() {
 return imports;
 }
+
+/**
+ * Just need enough validation to make sure nothing strange is going 
on.
+ * The compiler will validate this thoroughly when it tries to compile
+ * the resulting .java file.
+ */
+private String validateImport(String importEntry) {
+// This should either be a fully-qualified class name or a package
+// name with a wildcard
+if (importEntry.indexOf(';') > -1) {
+throw new IllegalArgumentException(
+Localizer.getMessage("jsp.error.page.invaild.import"));
+}
+return importEntry.trim();
+}
 }
 
 /**

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1632307&r1=1632306&r2=1632307&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu 
Oct 16 13:44:18 2014
@@ -38,6 +38,7 @@ jsp.error.page.invalid.buffer=Page direc
 jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple 
occurrences of 'autoFlush' with different values (old: {0}, new: {1})
 jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple 
occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
+jsp.error.page.invaild.import=Page directive: invalid value for import
 jsp.error.page.conflict.info=Page directive: illegal to have multiple 
occurrences of 'info' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.info=Page directive: invalid value for info
 jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple 
occurrences of 'isErrorPage' with different values (old: {0}, new: {1})

Added: tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java?rev=1632307&view=auto
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java (added)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java Thu Oct 16 
13:44:18 2014
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissio

svn commit: r1632290 - in /tomcat/trunk/test/org/apache/jasper/compiler: TestNode.java TestNodeIntegration.java

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 12:51:17 2014
New Revision: 1632290

URL: http://svn.apache.org/r1632290
Log:
Rename to make way for a unit test that doesn't use embedded

Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java
  - copied, changed from r1632288, 
tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java
Removed:
tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java

Copied: tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java 
(from r1632288, tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java?p2=tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java&p1=tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java&r1=1632288&r2=1632290&rev=1632290&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java Thu 
Oct 16 12:51:17 2014
@@ -25,7 +25,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
 
-public class TestNode extends TomcatBaseTest {
+public class TestNodeIntegration extends TomcatBaseTest {
 
 @Test
 public void testJspAttributeIsLiteral() throws Exception {



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

svn commit: r1632271 - /tomcat/trunk/java/org/apache/catalina/Container.java

2014-10-16 Thread markt

Author: markt
Date: Thu Oct 16 11:00:21 2014
New Revision: 1632271

URL: http://svn.apache.org/r1632271
Log:
Some more Javadoc cleanup

Modified:
tomcat/trunk/java/org/apache/catalina/Container.java

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1632271&r1=1632270&r2=1632271&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Thu Oct 16 11:00:21 
2014
@@ -113,22 +113,28 @@ public interface Container extends Lifec
 // - Properties
 
 /**
- * Return the Logger with which this Container is associated.  If there is
- * no associated Logger, return the Logger associated with our parent
- * Container (if any); otherwise return null.
+ * Obtain the log to which events for this container should be logged.
+ *
+ * @return The Logger with which this Container is associated.  If there is
+ * no associated Logger, return the Logger associated with the
+ * parent Container (if any); otherwise return null.
  */
 public Log getLogger();
 
 
 /**
- * Return the JMX name associated with this container.
+ * Obtain the JMX name for this container.
+ *
+ * @return the JMX name associated with this container.
  */
 public ObjectName getObjectName();
 
 
 /**
- * Obtain the domain under which this container will be / has been
+ * Obtain the JMX domain under which this container will be / has been
  * registered.
+ *
+ * @return The JMX domain name
  */
 public String getDomain();
 
@@ -146,14 +152,18 @@ public interface Container extends Lifec
 /**
  * Return the Pipeline object that manages the Valves associated with
  * this Container.
+ *
+ * @return The Pipeline
  */
 public Pipeline getPipeline();
 
 
 /**
- * Return the Cluster with which this Container is associated.  If there is
- * no associated Cluster, return the Cluster associated with our parent
- * Container (if any); otherwise return null.
+ * Get the Cluster for this container.
+ *
+ * @return The Cluster with which this Container is associated. If there is
+ * no associated Cluster, return the Cluster associated with our
+ * parent Container (if any); otherwise return null.
  */
 public Cluster getCluster();
 
@@ -168,12 +178,17 @@ public interface Container extends Lifec
 
 /**
  * Get the delay between the invocation of the backgroundProcess method on
- * this container and its children. Child containers will not be invoked
- * if their delay value is not negative (which would mean they are using
- * their own thread). Setting this to a positive value will cause
- * a thread to be spawn. After waiting the specified amount of time,
- * the thread will invoke the executePeriodic method on this container
- * and all its children.
+ * this container and its children. Child containers will not be invoked if
+ * their delay value is positive (which would mean they are using their own
+ * thread). Setting this to a positive value will cause a thread to be
+ * spawned. After waiting the specified amount of time, the thread will
+ * invoke the {@link #backgroundProcess()} method on this container and all
+ * children with non-positive delay values.
+ *
+ * @return The delay between the invocation of the backgroundProcess method
+ * on this container and its children. A non-positive value
+ * indicates that background processing will be managed by the
+ * parent.
  */
 public int getBackgroundProcessorDelay();
 
@@ -192,6 +207,8 @@ public interface Container extends Lifec
  * Return a name string (suitable for use by humans) that describes this
  * Container.  Within the set of child containers belonging to a particular
  * parent, Container names must be unique.
+ *
+ * @return The human readable name of this container.
  */
 public String getName();
 
@@ -211,8 +228,11 @@ public interface Container extends Lifec
 
 
 /**
- * Return the Container for which this Container is a child, if there is
- * one.  If there is no defined parent, return null.
+ * Get the parent container.
+ *
+ * @return Return the Container for which this Container is a child, if
+ * there is one. If there is no defined parent, return
+ * null.
  */
 public Container getParent();
 
@@ -232,9 +252,11 @@ public interface Container extends Lifec
 
 
 /**
- * Return the parent class loader for this component. If not set, return
- * {@link #getParent()} {@link #ge

[Tomcat Wiki] Update of "Security/POODLE" by OgnjenBlagojevic

2014-10-16 Thread Apache Wiki

Dear Wiki user,

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

The "Security/POODLE" page has been changed by OgnjenBlagojevic:
https://wiki.apache.org/tomcat/Security/POODLE

Comment:
Added POODLE vulnerability info

New page:
This Wiki entry serves as a place for all relevant information regarding 
[[http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3566|CVE-2014-3566]]
 (aka the POODLE SSL v3 vlunerability). Rather than regurgitating this 
information repeatedly on mailing lists, etc., please make references to this 
page and refer people to it.

== What is POODLE vulnerability? ==

POODLE is a SSL v3 protocol vulnerability. It allows attacker to downgrade 
SSL/TLS protocol to version SSL v3, and then break the cryptographic security 
(e.g. decrypt the trafic, hijack sessions, etc.)


== Prerequisites ==

In order for attack to be successful both client and server must support SSL 
v3, and attacker must be a man-in-the-middle, and must inject malicious 
JavaScript into the client browser.


== Mitigation ==

Disabling SSL v3 on either client side or server side will mitigate this 
vulnerability.

To disable SSL v3, and enable all TLS protocols plus SSLv2Hello pseudo-protocol 
on JSSE connectors add the following attributes to your connector configuration 
in server.xml:

  sslProtocol="TLS" sslEnabledProtocols="TLSv1.2,TLSv1.1,TLSv1,SSLv2Hello"
  
The same thing could be done on APR connector using following attributes:

  TODO


== On-line testing tools ==

Test your browser here:

  https://www.poodletest.com/

Test your server here:

  https://www.ssllabs.com/ssltest/

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

[Bug 53952] Add support for TLS 1.1 and 1.2

2014-10-16 Thread bugzilla

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

--- Comment #32 from jfclere  ---
Created attachment 32115
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32115&action=edit
patch for tc-trunk.

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

[Tomcat Wiki] Update of "FAQ/Security" by OgnjenBlagojevic

2014-10-16 Thread Apache Wiki

Dear Wiki user,

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

The "FAQ/Security" page has been changed by OgnjenBlagojevic:
https://wiki.apache.org/tomcat/FAQ/Security?action=diff&rev1=18&rev2=19

Comment:
Added question about POODLE attack

   1. [[#Q10|Why are passwords in plain text?]]
   1. [[#Q11|How can I restrict the list of ciphers used for HTTPS?]]
   1. [[#Q12|Is Tomcat vulnerable to Heartbleed bug?]]
+  1. [[#Q13|Is Tomcat vulnerable to POODLE attack?]]
  
  == Answers ==
  
@@ -100, +101 @@

  
  See [[Security/Heartbleed]].
  
+ <>
+ === Is Tomcat vulnerable to POODLE attack? ===
+ 
+ See [[Security/POODLE]].
+ 
  
  [[CategoryFAQ|CategoryFAQ]]
  

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

[Bug 53952] Add support for TLS 1.1 and 1.2

2014-10-16 Thread bugzilla

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

--- Comment #31 from jfclere  ---
Created attachment 32114
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32114&action=edit
patch for the issue.

The patch works for me.
Basically the SSL.java needs the new SSL_PROTOCOL_TLS11 and SSL_PROTOCOL_TLS12
and add to ALL.

To set the protocol I have set it to SSL.SSL_PROTOCOL_ALL; and use
!protocol.contains("java name") to allow support the java syntax for protocol.

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

[Tomcat Wiki] Trivial Update of "FAQ/Security" by OgnjenBlagojevic

2014-10-16 Thread Apache Wiki

Dear Wiki user,

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

The "FAQ/Security" page has been changed by OgnjenBlagojevic:
https://wiki.apache.org/tomcat/FAQ/Security?action=diff&rev1=17&rev2=18

Comment:
Reindex

  
  See [[HowTo/SSLCiphers]].
  
- <>
+ <>
  === Is Tomcat vulnerable to Heartbleed bug? ===
  
  See [[Security/Heartbleed]].

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

svn commit: r1632252 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java

2014-10-16 Thread kkolinko

Author: kkolinko
Date: Thu Oct 16 09:11:47 2014
New Revision: 1632252

URL: http://svn.apache.org/r1632252
Log:
Merged revision 1632251 from tomcat/trunk:
Remove duplicate call which result is already cached in a local variable (Noted 
when reviewing r1632223)

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

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

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

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1632252&r1=1632251&r2=1632252&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
Thu Oct 16 09:11:47 2014
@@ -137,8 +137,7 @@ public class WsWebSocketContainer
 Endpoint ep = new PojoEndpointClient(pojo, annotation.decoders());
 
 Class configuratorClazz =
-pojo.getClass().getAnnotation(
-ClientEndpoint.class).configurator();
+annotation.configurator();
 
 ClientEndpointConfig.Configurator configurator = null;
 if (!ClientEndpointConfig.Configurator.class.equals(



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

svn commit: r1632251 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

2014-10-16 Thread kkolinko

Author: kkolinko
Date: Thu Oct 16 09:09:59 2014
New Revision: 1632251

URL: http://svn.apache.org/r1632251
Log:
Remove duplicate call which result is already cached in a local variable (Noted 
when reviewing r1632223)

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1632251&r1=1632250&r2=1632251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu 
Oct 16 09:09:59 2014
@@ -137,8 +137,7 @@ public class WsWebSocketContainer
 Endpoint ep = new PojoEndpointClient(pojo, annotation.decoders());
 
 Class configuratorClazz =
-pojo.getClass().getAnnotation(
-ClientEndpoint.class).configurator();
+annotation.configurator();
 
 ClientEndpointConfig.Configurator configurator = null;
 if (!ClientEndpointConfig.Configurator.class.equals(



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

svn commit: r1632245 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/websocket/ java/org/apache/tomcat/websocket/server/ webapps/docs/ webapps/examples/websocket-deprecated/

2014-10-16 Thread kkolinko

Author: kkolinko
Date: Thu Oct 16 08:45:57 2014
New Revision: 1632245

URL: http://svn.apache.org/r1632245
Log:
Correct version of Java WebSocket mentioned in message displayed on Tomcat 
start on Java 6, in documentation and examples
Followup to r1632232

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/index.html

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java?rev=1632245&r1=1632244&r2=1632245&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java Thu 
Oct 16 08:45:57 2014
@@ -19,7 +19,7 @@ package org.apache.catalina.websocket;
 /**
  * Constants for this Java package.
  * 
- * @deprecated  Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated  Replaced by the JSR356 WebSocket 1.1 implementation and will be
  *  removed in Tomcat 8.0.x.  
  */
 @Deprecated

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java?rev=1632245&r1=1632244&r2=1632245&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java 
Thu Oct 16 08:45:57 2014
@@ -30,7 +30,7 @@ import org.apache.tomcat.util.res.String
  * specific functionality. Applications that wish to operate on a stream basis
  * rather than a message basis should use {@link StreamInbound}.
  * 
- * @deprecated  Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated  Replaced by the JSR356 WebSocket 1.1 implementation and will be
  *  removed in Tomcat 8.0.x.  
  */
 @Deprecated

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1632245&r1=1632244&r2=1632245&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java 
Thu Oct 16 08:45:57 2014
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.net.Abstra
  * specific functionality. Applications that wish to operate on a message basis
  * rather than a stream basis should use {@link MessageInbound}.
  * 
- * @deprecated  Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated  Replaced by the JSR356 WebSocket 1.1 implementation and will be
  *  removed in Tomcat 8.0.x.  
  */
 @Deprecated

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1632245&r1=1632244&r2=1632245&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java 
Thu Oct 16 08:45:57 2014
@@ -43,7 +43,7 @@ import org.apache.tomcat.util.res.String
  * connections as per RFC6455. It is expected that applications will extend 
this
  * implementation and provide application specific functionality.
  * 
- * @deprecated  Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated  Replaced by the JSR356 WebSocket 1.1 implementation and will be
  *  removed in Tomcat 8.0.x.  
  */
 @Deprecated

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket

svn commit: r1632234 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2014-10-16 Thread violetagg

Author: violetagg
Date: Thu Oct 16 08:16:24 2014
New Revision: 1632234

URL: http://svn.apache.org/r1632234
Log:
Update Websocket version supported by Tomcat 7

Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1632234&r1=1632233&r2=1632234&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Oct 16 08:16:24 2014
@@ -238,10 +238,10 @@ mapping between the specifications and t
 3.0
   2.2
   2.2
-  1.0
+  1.1
   7.0.x
   7.0.56
-  6 and later (WebSocket 1.0 requires 7 or later)
+  6 and later (WebSocket 1.1 requires 7 or later)
 
 
 
@@ -411,7 +411,7 @@ to that, it includes the following impro
 Apache Tomcat 7.x builds upon the improvements made in
 Tomcat 6.0.x and implements the Servlet 3.0,
 JSP 2.2, EL 2.2 and
-Web Socket 1.0 specifications. In addition
+Web Socket 1.1 specifications. In addition
 to that, it includes the following improvements:
 
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1632234&r1=1632233&r2=1632234&view=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Oct 16 08:16:24 2014
@@ -43,10 +43,10 @@ mapping between the specifications and t
   3.0
   2.2
   2.2
-  1.0
+  1.1
   7.0.x
   7.0.56
-  6 and later (WebSocket 1.0 requires 7 or later)
+  6 and later (WebSocket 1.1 requires 7 or later)
 
 
 
@@ -176,7 +176,7 @@ to that, it includes the following impro
 Apache Tomcat 7.x builds upon the improvements made in
 Tomcat 6.0.x and implements the Servlet 3.0,
 JSP 2.2, EL 2.2 and
-Web Socket 1.0 specifications. In addition
+Web Socket 1.1 specifications. In addition
 to that, it includes the following improvements:
 
 



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

svn commit: r1632232 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt RELEASE-NOTES build.xml webapps/docs/changelog.xml webapps/docs/class-loader-howto.xml webapps/docs/index.xml webapps/docs/project.xml

2014-10-16 Thread violetagg

Author: violetagg
Date: Thu Oct 16 08:09:12 2014
New Revision: 1632232

URL: http://svn.apache.org/r1632232
Log:
Merged revision 1631992 from tomcat/trunk:
Correct version of Java WebSocket mentioned in documentation
Followup to r1631839

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/RELEASE-NOTES
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/index.xml
tomcat/tc7.0.x/trunk/webapps/docs/project.xml

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

Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1632232&r1=1632231&r2=1632232&view=diff
==
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Thu Oct 16 08:09:12 2014
@@ -20,8 +20,8 @@
 
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 3.0 and JSP 2.2 specifications from the Java
-Community Process .
+implements the Servlet 3.0, JSP 2.2, EL 2.2 and WebSocket 1.1 specifications
+from the Java Community Process .
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
 it. You may simply download a binary distribution. It is cross-platform.

Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1632232&r1=1632231&r2=1632232&view=diff
==
--- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Thu Oct 16 08:09:12 2014
@@ -109,13 +109,13 @@ for use by web applications (by placing 
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 2.2 API)
 * servlet-api.jar (Servlet 3.0 API)
-* tomcat7-websocket.jar (WebSocket 1.0 implementation)
+* tomcat7-websocket.jar (WebSocket 1.1 implementation)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-util.jar (Various utilities)
-* websocket-api.jar (WebSocket 1.0 API)
+* websocket-api.jar (WebSocket 1.1 API)
 
 You can make additional APIs available to all of your web applications by
 putting unpacked classes into a "classes" directory (not created by default),

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Oct 16 08:09:12 2014
@@ -155,7 +155,7 @@
   
   
 
-  
+  
   
   
   
@@ -800,13 +800,13 @@
 
   
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 

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=1632232&r1=1632231&r2=1632232&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 16 08:09:12 2014
@@ -105,7 +105,11 @@
 's jvmRoute or in a system
 property. (schultz)
   
-  
+  
+Correct version of Java WebSocket mentioned in documentation
+(s/1.0/1.1/). (markt/kkolinko)
+  
+
   
 
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml Thu Oct 16 
08:09:12 2014
@@ -156,6 +156,8 @@ loaders as it is initialized:
 documentation for more details.
 tomcat-util.jar — Common classes used by various 
components of
 Apache Tomcat.
+tomcat7-websocket.jar — WebSocket 1.1 
implementation
+websocket-api.jar — WebSocket 1.1 API
 
 WebappX — A class loader is created for each web
 application that is deployed in a single Tomcat instance.  All unpacked

Modified: tomcat/tc7.0.x/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/w

svn commit: r1632229 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

2014-10-16 Thread kfujino

Author: kfujino
Date: Thu Oct 16 07:56:50 2014
New Revision: 1632229

URL: http://svn.apache.org/r1632229
Log:
Remove the unnecessary registration of context.xml as a redeploy resource. 
The context.xml having an external docBase has already been registered as a 
redeploy resource at first.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1632229&r1=1632228&r2=1632229&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Thu 
Oct 16 07:56:50 2014
@@ -700,8 +700,6 @@ public class HostConfig
 if (isExternalWar && unpackWARs) {
 
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
 Long.valueOf(expandedDocBase.lastModified()));
-deployedApp.redeployResources.put(contextXml.getAbsolutePath(),
-Long.valueOf(contextXml.lastModified()));
 addWatchedResources(deployedApp, 
expandedDocBase.getAbsolutePath(), context);
 } else {
 // Find an existing matching war and expanded folder

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=1632229&r1=1632228&r2=1632229&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 16 07:56:50 2014
@@ -67,6 +67,11 @@
 Correct a couple of NPEs in the JNDI Realm that could be triggered with
 when not specifying a roleBase and enabling roleSearchAsUser. (markt)
   
+  
+Remove the unnecessary registration of context.xml as a redeploy
+resource. The context.xml having an external docBase has already been
+registered as a redeploy resources at first. (kfujino)
+  
 
   
   



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

svn commit: r1632228 - in /tomcat/trunk: java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

2014-10-16 Thread kfujino

Author: kfujino
Date: Thu Oct 16 07:55:02 2014
New Revision: 1632228

URL: http://svn.apache.org/r1632228
Log:
Remove the unnecessary registration of context.xml as a redeploy resource. 
The context.xml having an external docBase has already been registered as a 
redeploy resource at first.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1632228&r1=1632227&r2=1632228&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Oct 16 
07:55:02 2014
@@ -602,8 +602,6 @@ public class HostConfig
 if (isExternalWar && unpackWARs) {
 
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
 Long.valueOf(expandedDocBase.lastModified()));
-deployedApp.redeployResources.put(contextXml.getAbsolutePath(),
-Long.valueOf(contextXml.lastModified()));
 addWatchedResources(deployedApp, 
expandedDocBase.getAbsolutePath(), context);
 } else {
 // Find an existing matching war and expanded folder

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1632228&r1=1632227&r2=1632228&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 16 07:55:02 2014
@@ -145,6 +145,11 @@
 correctly identify the associated Context when multiple versions of a
 Context with the same path are present. (markt)
   
+  
+Remove the unnecessary registration of context.xml as a redeploy
+resource. The context.xml having an external docBase has already been
+registered as a redeploy resource at first. (kfujino)
+  
 
   
   



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

svn commit: r1632224 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/UpgradeUtil.java

2014-10-16 Thread violetagg

Author: violetagg
Date: Thu Oct 16 07:49:53 2014
New Revision: 1632224

URL: http://svn.apache.org/r1632224
Log:
Merged revision 1631818 from tomcat/trunk:
Use constant strings for header names.

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

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java

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

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1632224&r1=1632223&r2=1632224&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 
Thu Oct 16 07:49:53 2014
@@ -180,10 +180,10 @@ public class UpgradeUtil {
 getWebSocketAccept(key));
 if (subProtocol != null && subProtocol.length() > 0) {
 // RFC6455 4.2.2 explicitly states "" is not valid here
-resp.setHeader("Sec-WebSocket-Protocol", subProtocol);
+resp.setHeader(Constants.WS_PROTOCOL_HEADER_NAME, subProtocol);
 }
 if (!transformations.isEmpty()) {
-resp.setHeader("Sec-WebSocket-Extensions", 
responseHeaderExtensions.toString());
+resp.setHeader(Constants.WS_EXTENSIONS_HEADER_NAME, 
responseHeaderExtensions.toString());
 }
 
 WsHandshakeRequest wsRequest = new WsHandshakeRequest(req);



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

svn commit: r1632223 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java webapps/docs/changelog.xml

2014-10-16 Thread violetagg

Author: violetagg
Date: Thu Oct 16 07:46:36 2014
New Revision: 1632223

URL: http://svn.apache.org/r1632223
Log:
Merged revision 1631817 from tomcat/trunk:
Fix client subprotocol handling (pass protocol names from the annotation).

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

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1632223&r1=163&r2=1632223&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
Thu Oct 16 07:46:36 2014
@@ -162,6 +162,7 @@ public class WsWebSocketContainer
 ClientEndpointConfig config = builder.
 decoders(Arrays.asList(annotation.decoders())).
 encoders(Arrays.asList(annotation.encoders())).
+
preferredSubprotocols(Arrays.asList(annotation.subprotocols())).
 build();
 return connectToServer(ep, config, path);
 }

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=1632223&r1=163&r2=1632223&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 16 07:46:36 2014
@@ -84,6 +84,9 @@
 single pass; either because the buffer is too small or the server sent
 the response in multiple packets. (markt)
   
+  
+Fix client subprotocol handling. (remm)
+  
 
   
   



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

44 matches

Mail list logo