Author: violetagg
Date: Mon Nov 4 22:02:17 2013
New Revision: 1538789
URL: http://svn.apache.org/r1538789
Log:
Merged revision 1538781 from tomcat/trunk:
According to the ServiceLoader specification the name of the
provider-configuration file is the fully-qualified binary name of the service's
type.
In this case instead of
javax.websocket.server.ServerEndpointConfig.Configurator the file name should
be javax.websocket.server.ServerEndpointConfig$Configurator.
Added:
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
Removed:
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig.Configurator
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1538781
Added:
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig%24Configurator?rev=1538789&view=auto
==============================================================================
---
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
(added)
+++
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
Mon Nov 4 22:02:17 2013
@@ -0,0 +1 @@
+org.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator
\ No newline at end of file
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=1538789&r1=1538788&r2=1538789&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Nov 4 22:02:17 2013
@@ -79,9 +79,9 @@
to <code>MessageHandler</code> method calls. (markt)
</fix>
<fix>
- Updated servlet spec version and documentation section-number
reported
- when JAR files are rejected for containing a trigger class
- (e.g. javax.servlet.Servlet). (schultz)
+ Updated servlet spec version and documentation section-number reported
+ when JAR files are rejected for containing a trigger class
+ (e.g. javax.servlet.Servlet). (schultz)
</fix>
<add>
Modify the WebSocket handshake process so that the user properties
@@ -110,6 +110,13 @@
Prevent file descriptors leak and ensure that files are closed when
configuring the web application. (violetagg)
</fix>
+ <fix>
+ Fixed the name of the provider-configuration file located in
+ <code>tomcat7-websocket.jar!/META-INF/services</code> that exposes
+ information for
+ <code>javax.websocket.server.ServerEndpointConfig$Configurator</code>
+ implementation. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
