You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by mw...@apache.org on 2009/11/17 23:42:20 UTC
svn commit: r881588 - in /mina/sandbox/mwebb/mina/src/main/java: ./
org/apache/mina/spdy/ org/apache/mina/spdy/messages/data/
org/apache/mina/spdy/protocol/
Author: mwebb
Date: Tue Nov 17 22:42:19 2009
New Revision: 881588
URL: http://svn.apache.org/viewvc?rev=881588&view=rev
Log:
Renamed DataFrame to SpdyDataFrame
Added to the TODO
Added log4j.properties
Added:
mina/sandbox/mwebb/mina/src/main/java/log4j.properties
mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/SpdyDataFrame.java
- copied, changed from r881581, mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/DataFrame.java
Removed:
mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/DataFrame.java
Modified:
mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/TODO
mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/protocol/SpdyMessageDecoder.java
Added: mina/sandbox/mwebb/mina/src/main/java/log4j.properties
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/log4j.properties?rev=881588&view=auto
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/log4j.properties (added)
+++ mina/sandbox/mwebb/mina/src/main/java/log4j.properties Tue Nov 17 22:42:19 2009
@@ -0,0 +1,26 @@
+#############################################################################
+# 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 permissions and
+# limitations under the License.
+#############################################################################
+# Please don't modify the log level until we reach to acceptable test coverage.
+# It's very useful when I test examples manually.
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
+
+# you could use this pattern to test the MDC with the Chat server
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %t %p %X{name} [%X{user}] [%X{remoteIp}:%X{remotePort}] [%c] - %m%n
\ No newline at end of file
Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/TODO
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/TODO?rev=881588&r1=881587&r2=881588&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/TODO (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/TODO Tue Nov 17 22:42:19 2009
@@ -12,3 +12,6 @@
4. Make sure we are only reading from buffers that actually
have data in them. There are places in the code where
we may read data from an IoBuffer that has no data.
+5. Develop a base IoHandler class for the protocol. Make it
+ such that others can extend the functionality of the
+ handler.
Copied: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/SpdyDataFrame.java (from r881581, mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/DataFrame.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/SpdyDataFrame.java?p2=mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/SpdyDataFrame.java&p1=mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/DataFrame.java&r1=881581&r2=881588&rev=881588&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/DataFrame.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/messages/data/SpdyDataFrame.java Tue Nov 17 22:42:19 2009
@@ -18,7 +18,7 @@
*
*
*/
-public class DataFrame extends AbstractSpdyFrame {
+public class SpdyDataFrame extends AbstractSpdyFrame {
private int streamId;
@@ -34,7 +34,7 @@
* @param data
* The data
*/
- public DataFrame( int streamId,
+ public SpdyDataFrame( int streamId,
byte flags, int length, IoBuffer data ){
super( 0, flags, length, data );
Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/protocol/SpdyMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/protocol/SpdyMessageDecoder.java?rev=881588&r1=881587&r2=881588&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/protocol/SpdyMessageDecoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/spdy/protocol/SpdyMessageDecoder.java Tue Nov 17 22:42:19 2009
@@ -12,7 +12,7 @@
import org.apache.mina.spdy.messages.control.PingControlFrame;
import org.apache.mina.spdy.messages.control.SynReplyControlFrame;
import org.apache.mina.spdy.messages.control.SynStreamControlFrame;
-import org.apache.mina.spdy.messages.data.DataFrame;
+import org.apache.mina.spdy.messages.data.SpdyDataFrame;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,7 +100,7 @@
data.put(byteData);
data.flip();
- out.write( new DataFrame(streamId, flags, length, data ));
+ out.write( new SpdyDataFrame(streamId, flags, length, data ));
} else {
// Control Frame. Figure out which one and go with it..