Author: markt Date: Thu Oct 15 09:26:08 2015 New Revision: 1708746 URL: http://svn.apache.org/viewvc?rev=1708746&view=rev Log: Move CaseInsensitiveKeyMap to o.a.t.util.collections so it is available outside of the WebSocket implementation (I want to re-use it in HTTP/2's PushBuilder)
Added: tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java - copied, changed from r1708580, tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java Removed: tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java Copied: tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java (from r1708580, tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java?p2=tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java&r1=1708580&r2=1708746&rev=1708746&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java Thu Oct 15 09:26:08 2015 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomcat.websocket; +package org.apache.tomcat.util.collections; import java.util.AbstractMap; import java.util.AbstractSet; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java?rev=1708746&r1=1708745&r2=1708746&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java Thu Oct 15 09:26:08 2015 @@ -23,6 +23,8 @@ import java.util.Map.Entry; import javax.websocket.HandshakeResponse; +import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap; + /** * Represents the response to a WebSocket handshake. */ 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=1708746&r1=1708745&r2=1708746&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu Oct 15 09:26:08 2015 @@ -65,6 +65,7 @@ import javax.websocket.WebSocketContaine import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.codec.binary.Base64; +import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.websocket.pojo.PojoEndpointClient; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java?rev=1708746&r1=1708745&r2=1708746&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java Thu Oct 15 09:26:08 2015 @@ -30,7 +30,7 @@ import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; import javax.websocket.server.HandshakeRequest; -import org.apache.tomcat.websocket.CaseInsensitiveKeyMap; +import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap; /** * Represents the request that this session was opened under. Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1708746&r1=1708745&r2=1708746&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Thu Oct 15 09:26:08 2015 @@ -65,7 +65,7 @@ import org.apache.catalina.valves.Access import org.apache.catalina.webresources.StandardRoot; import org.apache.coyote.http11.Http11NioProtocol; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.websocket.CaseInsensitiveKeyMap; +import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap; /** * Base test case that provides a Tomcat instance for each test - mainly so we Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java?rev=1708746&r1=1708745&r2=1708746&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java Thu Oct 15 09:26:08 2015 @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap; import org.junit.Assert; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org