tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1452049 - in /tomcat/trunk: java/org/apache/catalina/websocket/ java/org/apache/tomcat/util/buf/ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/
Date Sun, 03 Mar 2013 14:57:45 GMT
Author: markt
Date: Sun Mar  3 14:57:44 2013
New Revision: 1452049

URL: http://svn.apache.org/r1452049
Log:
Move the Apache Harmony based UTF-8 decoder from the JSR356 web socket implementation to the
util package. Point the pre-JSR356 web socket implementation to use the newly copied UTF-8
decoder in the util package.

Added:
    tomcat/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java
      - copied, changed from r1451948, tomcat/trunk/java/org/apache/tomcat/websocket/Utf8Decoder.java
Removed:
    tomcat/trunk/java/org/apache/catalina/websocket/Utf8Decoder.java
    tomcat/trunk/java/org/apache/tomcat/websocket/Utf8Decoder.java
Modified:
    tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java
    tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
    tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
    tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java

Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java?rev=1452049&r1=1452048&r2=1452049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java Sun Mar  3 14:57:44
2013
@@ -27,6 +27,7 @@ import java.nio.charset.UnmappableCharac
 import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.WebConnection;
 
+import org.apache.tomcat.util.buf.Utf8Decoder;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1452049&r1=1452048&r2=1452049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsFrame.java Sun Mar  3 14:57:44 2013
@@ -24,6 +24,7 @@ import java.nio.CharBuffer;
 import java.nio.charset.CoderResult;
 
 import org.apache.catalina.util.Conversions;
+import org.apache.tomcat.util.buf.Utf8Decoder;
 import org.apache.tomcat.util.res.StringManager;
 
 /**

Copied: tomcat/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java (from r1451948, tomcat/trunk/java/org/apache/tomcat/websocket/Utf8Decoder.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java?p2=tomcat/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/Utf8Decoder.java&r1=1451948&r2=1452049&rev=1452049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Utf8Decoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Utf8Decoder.java Sun Mar  3 14:57:44 2013
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.util.buf;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 
-import org.apache.tomcat.util.buf.B2CConverter;
 
 /**
  * Decodes bytes to UTF-8. Extracted from Apache Harmony and modified to reject

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1452049&r1=1452048&r2=1452049&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Sun Mar  3 14:57:44 2013
@@ -28,6 +28,7 @@ import javax.websocket.CloseReason.Close
 import javax.websocket.MessageHandler;
 import javax.websocket.PongMessage;
 
+import org.apache.tomcat.util.buf.Utf8Decoder;
 import org.apache.tomcat.util.res.StringManager;
 
 /**

Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java?rev=1452049&r1=1452048&r2=1452049&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestUtf8.java Sun Mar  3 14:57:44 2013
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertEqu
 import org.junit.Test;
 
 import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.buf.Utf8Decoder;
 
 public class TestUtf8 {
 



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


Mime
View raw message