Author: markt
Date: Mon Mar 23 10:18:34 2015
New Revision: 1668584
URL: http://svn.apache.org/r1668584
Log:
Refactoring.
Remove PACKAGE_NAME constant.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java Mon Mar
23 10:18:34 2015
@@ -21,9 +21,6 @@ package org.apache.tomcat.websocket.serv
*/
public class Constants {
- protected static final String PACKAGE_NAME =
- Constants.class.getPackage().getName();
-
public static final String BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.binaryBufferSize";
public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java Mon
Mar 23 10:18:34 2015
@@ -34,8 +34,7 @@ import org.apache.tomcat.util.res.String
*/
public class UriTemplate {
- private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ private static final StringManager sm =
StringManager.getManager(UriTemplate.class);
private final String normalized;
private final List<Segment> segments = new ArrayList<>();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Mon Mar 23 10:18:34 2015
@@ -46,10 +46,8 @@ import org.apache.tomcat.websocket.WsSes
*/
public class WsHttpUpgradeHandler implements InternalHttpUpgradeHandler {
- private static final Log log =
- LogFactory.getLog(WsHttpUpgradeHandler.class);
- private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ private static final Log log =
LogFactory.getLog(WsHttpUpgradeHandler.class);
+ private static final StringManager sm =
StringManager.getManager(WsHttpUpgradeHandler.class);
private final ClassLoader applicationClassLoader;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Mon Mar 23 10:18:34 2015
@@ -39,7 +39,7 @@ import org.apache.tomcat.websocket.WsRem
public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase {
private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ StringManager.getManager(WsRemoteEndpointImplServer.class);
private static final Log log =
LogFactory.getLog(WsHttpUpgradeHandler.class);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1668584&r1=1668583&r2=1668584&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Mon Mar 23 10:18:34 2015
@@ -70,8 +70,7 @@ import org.apache.tomcat.websocket.pojo.
public class WsServerContainer extends WsWebSocketContainer
implements ServerContainer {
- private static final StringManager sm =
- StringManager.getManager(Constants.PACKAGE_NAME);
+ private static final StringManager sm =
StringManager.getManager(WsServerContainer.class);
private static final Log log = LogFactory.getLog(WsServerContainer.class);
private static final CloseReason AUTHENTICATED_HTTP_SESSION_CLOSED =
@@ -267,7 +266,7 @@ public class WsServerContainer extends W
configurator(configurator).
build();
sec.getUserProperties().put(
- PojoEndpointServer.POJO_METHOD_MAPPING_KEY,
+
org.apache.tomcat.websocket.pojo.Constants.POJO_METHOD_MAPPING_KEY,
methodMapping);
addEndpoint(sec);
@@ -384,7 +383,7 @@ public class WsServerContainer extends W
if
(!PojoEndpointServer.class.isAssignableFrom(sec.getEndpointClass())) {
// Need to make path params available to POJO
sec.getUserProperties().put(
- PojoEndpointServer.POJO_PATH_PARAM_KEY,
+
org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY,
pathParams);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
