jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing HTTPEventSelector.java,NONE,1.1 ScreenerBuilderImpl.java,NONE,1.1 AbstractStage.java,1.1,1.2 EchoStage.java,1.1,1.2 FilesystemStage.java,1.1,1.2 GeneralAndResponseHeadersStage.java,1.1,1.2 HTTPEvent.java,1.1,1.2 ParsingStage.java,1.1,1.2 ResponseCompletionStage.java,1.1,1.2 WritingStage.java,1.1,1.2 HTTPScreenerBuilderImpl.java,1.1,NONE HTTPSelector.java,1.1,NONE
Leo Simons <[email protected]>
| Newsgroups | gmane.comp.java.jicarilla.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18181/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing
Modified Files:
AbstractStage.java EchoStage.java FilesystemStage.java
GeneralAndResponseHeadersStage.java HTTPEvent.java
ParsingStage.java ResponseCompletionStage.java
WritingStage.java
Added Files:
HTTPEventSelector.java ScreenerBuilderImpl.java
Removed Files:
HTTPScreenerBuilderImpl.java HTTPSelector.java
Log Message:
remove the HTTP prefix from nearly every class and interface. Less typing, cleaner reading :-D
--- HTTPSelector.java DELETED ---
--- NEW FILE: ScreenerBuilderImpl.java ---
/* ====================================================================
The Jicarilla Software License
Copyright (c) 2003 Leo Simons.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
==================================================================== */
package org.jicarilla.webserver.plumbing;
import org.jicarilla.lang.Assert;
import org.jicarilla.lang.Selector;
import org.jicarilla.plumbing.Screener;
import org.jicarilla.plumbing.SimpleScreener;
import org.jicarilla.plumbing.Sink;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
/**
*
*
* @author <a href="lsimons at jicarilla dot org">Leo Simons</a>
* @version $Id: ScreenerBuilderImpl.java,v 1.1 2004/04/09 15:52:27 lsimons Exp $
*/
public class ScreenerBuilderImpl implements ScreenerBuilder
{
protected List sinks = new ArrayList();
public Screener create() throws Exception
{
final Screener s = new SimpleScreener();
populate( s );
return s;
}
public ScreenerBuilder addStage( final Object selectionCriterion,
final Sink sink )
{
sinks.add( new Entry( selectionCriterion, sink ) );
return this;
}
protected void populate( final Screener s )
{
final Iterator it = sinks.iterator();
while( it.hasNext() )
{
final Entry entry = (Entry)it.next();
if( entry.criterion instanceof HTTPEventSelector )
{
s.addSink( (Selector)entry.criterion, entry.sink );
continue;
}
final HTTPEventSelector selector;
if( entry.criterion instanceof Pattern )
{
selector = new HTTPEventSelector();
selector.addURLPattern( (Pattern)entry.criterion );
s.addSink( selector, entry.sink );
continue;
}
if( entry.criterion instanceof InetAddress )
{
selector = new HTTPEventSelector();
selector.addVirtualHost( (InetAddress)entry.criterion );
s.addSink( selector, entry.sink );
continue;
}
}
}
protected static class Entry
{
public Object criterion;
public Sink sink;
protected Entry( final Object aCriterion, final Sink aSink )
{
Assert.assertNotNull( "criterion argument may not be null",
criterion );
Assert.assertNotNull( "sink argument may not be null", sink );
criterion = aCriterion;
sink = aSink;
}
}
}
Index: HTTPEvent.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/HTTPEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HTTPEvent.java 31 Mar 2004 12:11:00 -0000 1.1
+++ HTTPEvent.java 9 Apr 2004 15:52:27 -0000 1.2
@@ -25,7 +25,7 @@
==================================================================== */
package org.jicarilla.webserver.plumbing;
-import org.jicarilla.http.HTTPMessage;
+import org.jicarilla.http.Message;
import org.jicarilla.net.Event;
/**
@@ -36,24 +36,24 @@
*/
public class HTTPEvent extends Event
{
- public synchronized HTTPMessage getHTTPRequest()
+ public synchronized Message getHTTPRequest()
{
if( getRequest() == null )
{
- final HTTPMessage msg = new HTTPMessage();
- msg.setMessageType( HTTPMessage.TYPE_REQUEST );
+ final Message msg = new Message();
+ msg.setMessageType( Message.TYPE_REQUEST );
setRequest( msg );
}
- return (HTTPMessage)getRequest();
+ return (Message)getRequest();
}
- public HTTPMessage getHTTPResponse()
+ public Message getHTTPResponse()
{
if( getResponse() == null )
{
- final HTTPMessage msg = new HTTPMessage();
- msg.setMessageType( HTTPMessage.TYPE_RESPONSE );
+ final Message msg = new Message();
+ msg.setMessageType( Message.TYPE_RESPONSE );
setResponse( msg );
}
- return (HTTPMessage)getResponse();
+ return (Message)getResponse();
}
}
Index: FilesystemStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/FilesystemStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FilesystemStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ FilesystemStage.java 9 Apr 2004 15:52:26 -0000 1.2
@@ -26,10 +26,10 @@
package org.jicarilla.webserver.plumbing;
import EDU.oswego.cs.dl.util.concurrent.Channel;
-import org.jicarilla.http.HTTPEncoding;
+import org.jicarilla.http.Encoding;
+import org.jicarilla.http.FileReader;
import org.jicarilla.http.HTTPException;
-import org.jicarilla.http.HTTPFileReader;
-import org.jicarilla.http.HTTPMessage;
+import org.jicarilla.http.Message;
import org.jicarilla.plumbing.Sink;
import java.io.IOException;
@@ -42,21 +42,21 @@
*/
public class FilesystemStage extends AbstractStage
{
- protected HTTPFileReader m_fileReader;
+ protected FileReader m_fileReader;
- public FilesystemStage( final Channel queue, final Sink errorHandler, final HTTPFileReader fr )
+ public FilesystemStage( final Channel queue, final Sink errorHandler, final FileReader fr )
{
super( queue, errorHandler );
setFileReader( fr);
}
- public HTTPFileReader getFileReader()
+ public FileReader getFileReader()
{
return m_fileReader;
}
- public void setFileReader( final HTTPFileReader fileReader )
+ public void setFileReader( final FileReader fileReader )
{
m_fileReader = fileReader;
}
@@ -67,18 +67,18 @@
protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
- final HTTPMessage req = e.getHTTPRequest();
- final HTTPMessage res = e.getHTTPResponse();
+ final Message req = e.getHTTPRequest();
+ final Message res = e.getHTTPResponse();
final String file = req.getField2String();
final int size = m_fileReader.readFile( file, res );
- res.addHeader( HTTPEncoding.HEADER_CONTENT_LENGTH,
+ res.addHeader( Encoding.HEADER_CONTENT_LENGTH,
""+size );
- res.setField1( HTTPEncoding.VERSION_10 );
- res.setStatusCode( HTTPEncoding.STATUS_200_OK );
- res.setField3( HTTPEncoding.STATUS_200_MSG );
+ res.setField1( Encoding.VERSION_10 );
+ res.setStatusCode( Encoding.STATUS_200_OK );
+ res.setField3( Encoding.STATUS_200_MSG );
res.setMessageType(false);
res.setComplete(true);
e.getContext().put( WritingStage.CLOSE_AFTER_WRITE_CONTEXT_KEY,
--- HTTPScreenerBuilderImpl.java DELETED ---
--- NEW FILE: HTTPEventSelector.java ---
/* ====================================================================
The Jicarilla Software License
Copyright (c) 2003 Leo Simons.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
==================================================================== */
package org.jicarilla.webserver.plumbing;
import org.jicarilla.http.Field;
import org.jicarilla.http.Message;
import org.jicarilla.lang.RegexpSelector;
import org.jicarilla.lang.Selector;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
/**
*
*
* @author <a href="lsimons at jicarilla dot org">Leo Simons</a>
* @version $Id: HTTPEventSelector.java,v 1.1 2004/04/09 15:52:27 lsimons Exp $
*/
public class HTTPEventSelector implements Selector
{
protected List m_methodSelectors = new ArrayList();
protected List m_uriSelectors = new ArrayList();
protected List m_versionSelectors = new ArrayList();
protected List m_headerSelectors = new ArrayList();
protected List m_bodySelectors = new ArrayList();
public final static boolean POLICY_AND = true;
public final static boolean POLICY_OR = false;
protected boolean m_methodSelectorPolicy = POLICY_OR;
protected boolean m_uriSelectorPolicy = POLICY_OR;
protected boolean m_versionSelectorPolicy = POLICY_OR;
protected boolean m_headerSelectorPolicy = POLICY_AND;
protected boolean m_bodySelectorPolicy = POLICY_AND;
protected boolean m_globalPolicy = POLICY_AND;
public boolean select( final Object object )
{
if(! (object instanceof HTTPEvent) )
return false;
final HTTPEvent event = (HTTPEvent)object;
final Message request = event.getHTTPRequest();
if( m_globalPolicy == POLICY_AND )
return selectStartLine(request) &&
selectHeaders(request) &&
selectBody(request);
else
// POLICY_OR
return selectStartLine(request) ||
selectHeaders(request) ||
selectBody(request);
}
public void addURLPattern( final Pattern pattern )
{
final Selector s = new RegexpSelector( pattern );
m_uriSelectors.add( s );
}
public void addVirtualHost( final InetAddress host )
{
final String hostname = host.getHostName();
final Pattern pattern = Pattern.compile( "Host:[ \\t]*" + hostname,
Pattern.CASE_INSENSITIVE );
final Selector s = new RegexpSelector( pattern );
m_uriSelectors.add( s );
}
protected boolean selectStartLine( final Message request )
{
if( m_globalPolicy == POLICY_AND )
return selectMethod(request) &&
selectURI(request) &&
selectVersion(request);
else
// POLICY_OR
return selectMethod(request) ||
selectURI(request) ||
selectVersion(request);
}
protected boolean selectMethod( final Message request )
{
if( m_methodSelectors.size() == 0 )
return true;
final String method = request.getField1String();
return select( method, m_methodSelectors, m_methodSelectorPolicy );
}
protected boolean selectURI( final Message request )
{
if( m_uriSelectors.size() == 0 )
return true;
final String uri = request.getField2String();
return select( uri, m_uriSelectors, m_uriSelectorPolicy );
}
protected boolean selectVersion( final Message request )
{
if( m_versionSelectors.size() == 0 )
return true;
final String version = request.getField3String();
return select( version, m_methodSelectors, m_methodSelectorPolicy );
}
protected boolean selectHeaders( final Message request )
{
if( m_versionSelectors.size() == 0 )
return true;
final List headers = request.getHeaders();
final Iterator it = headers.iterator();
if( m_headerSelectorPolicy == POLICY_AND )
{
while( it.hasNext() )
{
final Field header = (Field)it.next();
final String headerString = header.toExternalForm();
if(!selectHeader( headerString, m_headerSelectors, m_headerSelectorPolicy ) )
return false;
}
return true;
}
else
{
while( it.hasNext() )
{
final Field header = (Field)it.next();
final String headerString = header.toExternalForm();
if(selectHeader( headerString, m_headerSelectors, m_headerSelectorPolicy ) )
return true;
}
return true;
}
}
protected boolean selectBody( final Message request )
{
if( m_bodySelectors.size() == 0 )
return true;
return select( request.getBodyAsString(), m_bodySelectors, m_bodySelectorPolicy );
}
protected boolean select( final String field, final List selectors, final boolean policy )
{
final Iterator it = selectors.iterator();
if( policy == POLICY_AND )
{
while( it.hasNext() )
{
final Selector selector = (Selector)it.next();
if( !selector.select( field ) )
return false;
}
return true;
}
else
{
// POLICY_OR
while( it.hasNext() )
{
final Selector selector = (Selector)it.next();
if( selector.select( field ) )
return true;
}
return false;
}
}
protected boolean selectHeader( final String header, final List selectors, final boolean policy )
{
final Iterator it = selectors.iterator();
while( it.hasNext() )
{
final Selector selector = (Selector)it.next();
if( selector.select( header ) )
return true;
}
return false;
}
}
Index: GeneralAndResponseHeadersStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/GeneralAndResponseHeadersStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GeneralAndResponseHeadersStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ GeneralAndResponseHeadersStage.java 9 Apr 2004 15:52:27 -0000 1.2
@@ -26,7 +26,7 @@
package org.jicarilla.webserver.plumbing;
import EDU.oswego.cs.dl.util.concurrent.Channel;
-import org.jicarilla.http.HTTPMessage;
+import org.jicarilla.http.Message;
import org.jicarilla.lang.Assert;
import org.jicarilla.plumbing.Sink;
@@ -34,7 +34,7 @@
*
* @todo Connection header
* @todo Date header
- * @todo put constants in HTTPEncoding
+ * @todo put constants in Encoding
* @author <a href="lsimons at jicarilla dot org">Leo Simons</a>
* @version $Id$
*/
@@ -53,7 +53,7 @@
protected void process( final HTTPEvent event )
{
- final HTTPMessage res = event.getHTTPResponse();
+ final Message res = event.getHTTPResponse();
res.addHeader( "Server", m_serverIdentification );
res.addHeader( "Connection", "close" );
Index: WritingStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/WritingStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WritingStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ WritingStage.java 9 Apr 2004 15:52:27 -0000 1.2
@@ -27,15 +27,15 @@
import EDU.oswego.cs.dl.util.concurrent.Channel;
import org.jicarilla.http.HTTPException;
-import org.jicarilla.http.HTTPMessage;
-import org.jicarilla.http.HTTPMessageWriterImpl;
+import org.jicarilla.http.Message;
+import org.jicarilla.http.MessageWriterImpl;
import org.jicarilla.plumbing.Sink;
import java.io.IOException;
import java.nio.channels.SocketChannel;
/**
- * Wraps HTTPMessageWriterImpl as a stage in the pipeline.
+ * Wraps MessageWriterImpl as a stage in the pipeline.
* Not threadsafe.
*
* @author <a href="lsimons at jicarilla dot org">Leo Simons</a>
@@ -46,29 +46,29 @@
public final static String CLOSE_AFTER_WRITE_CONTEXT_KEY = "urn:jicarilla:http:context-key:" +
WritingStage.class.getPackage().getName() + ":close-after-write";
- private HTTPMessageWriterImpl m_writer;
+ private MessageWriterImpl m_writer;
public WritingStage( final Channel queue, final Sink errorHandler )
{
super( queue, errorHandler );
// todo remove hardwiring
- m_writer = new HTTPMessageWriterImpl();
+ m_writer = new MessageWriterImpl();
}
- protected HTTPMessageWriterImpl getWriter()
+ protected MessageWriterImpl getWriter()
{
return m_writer;
}
- protected void setWriter( final HTTPMessageWriterImpl writer )
+ protected void setWriter( final MessageWriterImpl writer )
{
m_writer = writer;
}
public void process( final HTTPEvent e ) throws HTTPException, IOException
{
- final HTTPMessage m = e.getHTTPResponse();
+ final Message m = e.getHTTPResponse();
final SocketChannel c = e.getChannel();
getWriter().write( m, c,
Index: ParsingStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/ParsingStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ParsingStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ ParsingStage.java 9 Apr 2004 15:52:27 -0000 1.2
@@ -27,14 +27,14 @@
import EDU.oswego.cs.dl.util.concurrent.Channel;
import org.apache.commons.pool.impl.SoftReferenceObjectPool;
-import org.jicarilla.http.HTTPEncoding;
+import org.jicarilla.http.Encoding;
import org.jicarilla.http.HTTPException;
-import org.jicarilla.http.HTTPMessage;
-import org.jicarilla.http.HTTPMessageGenerator;
-import org.jicarilla.http.HTTPParser;
-import org.jicarilla.http.HTTPParserImpl;
+import org.jicarilla.http.Message;
import org.jicarilla.http.MessageFactory;
+import org.jicarilla.http.MessageGenerator;
import org.jicarilla.http.MessageReceivedListener;
+import org.jicarilla.http.Parser;
+import org.jicarilla.http.ParserImpl;
import org.jicarilla.lang.ExceptionListener;
import org.jicarilla.plumbing.Sink;
@@ -45,7 +45,7 @@
import java.nio.channels.SocketChannel;
/**
- * Wraps HTTPParserImpl as a stage in the pipeline. Not
+ * Wraps ParserImpl as a stage in the pipeline. Not
* threadsafe.
*
* @author <a href="lsimons at jicarilla dot org">Leo Simons</a>
@@ -55,8 +55,8 @@
{
public final static int BUFFER_SIZE = 8096;
- protected HTTPParserImpl m_parser;
- protected HTTPMessageGenerator m_generator;
+ protected ParserImpl m_parser;
+ protected MessageGenerator m_generator;
protected Listener m_listener;
public ParsingStage( final Channel queue, final Sink errorHandler )
@@ -66,14 +66,14 @@
// todo: remove hard-wiring
setListener( new Listener() );
setGenerator(
- new HTTPMessageGenerator(
+ new MessageGenerator(
getListener(),
getListener(),
new SoftReferenceObjectPool( new MessageFactory() )
)
);
setParser(
- new HTTPParserImpl(
+ new ParserImpl(
getGenerator(),
getGenerator()
)
@@ -90,22 +90,22 @@
m_listener = listener;
}
- protected HTTPMessageGenerator getGenerator()
+ protected MessageGenerator getGenerator()
{
return m_generator;
}
- protected void setGenerator( final HTTPMessageGenerator generator )
+ protected void setGenerator( final MessageGenerator generator )
{
m_generator = generator;
}
- protected HTTPParser getParser()
+ protected Parser getParser()
{
return m_parser;
}
- protected void setParser( final HTTPParserImpl parser )
+ protected void setParser( final ParserImpl parser )
{
m_parser = parser;
}
@@ -168,9 +168,9 @@
protected static class Listener
implements MessageReceivedListener, ExceptionListener
{
- public HTTPMessage message = null;
+ public Message message = null;
- public void messageReceived( final HTTPMessage m )
+ public void messageReceived( final Message m )
{
message = m;
}
@@ -178,11 +178,11 @@
public void exceptionOccurred( final Throwable t )
{
// todo improve
- final HTTPMessage exMessage = new HTTPMessage();
- exMessage.setMessageType( HTTPMessage.TYPE_RESPONSE );
- exMessage.setField1( HTTPEncoding.VERSION_10 );
+ final Message exMessage = new Message();
+ exMessage.setMessageType( Message.TYPE_RESPONSE );
+ exMessage.setField1( Encoding.VERSION_10 );
exMessage.setStatusCode(
- HTTPEncoding.STATUS_500_Internal_Server_Error );
+ Encoding.STATUS_500_Internal_Server_Error );
exMessage.setField3( "Internal Server Error" );
final StringWriter sw = new StringWriter();
Index: ResponseCompletionStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/ResponseCompletionStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ResponseCompletionStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ ResponseCompletionStage.java 9 Apr 2004 15:52:27 -0000 1.2
@@ -26,9 +26,9 @@
package org.jicarilla.webserver.plumbing;
import EDU.oswego.cs.dl.util.concurrent.Channel;
-import org.jicarilla.http.HTTPEncoding;
-import org.jicarilla.http.HTTPField;
-import org.jicarilla.http.HTTPMessage;
+import org.jicarilla.http.Encoding;
+import org.jicarilla.http.Field;
+import org.jicarilla.http.Message;
import org.jicarilla.http.util.NioUtil;
import org.jicarilla.plumbing.Sink;
@@ -56,20 +56,20 @@
protected void ensureStartLine( final HTTPEvent e )
{
- final HTTPMessage res = e.getHTTPResponse();
+ final Message res = e.getHTTPResponse();
if( res.getField1() == null )
- res.setField1( HTTPEncoding.VERSION_10 );
+ res.setField1( Encoding.VERSION_10 );
if( res.getField2() == null )
- res.setStatusCode( HTTPEncoding.STATUS_200_OK );
+ res.setStatusCode( Encoding.STATUS_200_OK );
if( res.getField3() == null )
- res.setField3( HTTPEncoding.STATUS_MSG[res.getStatusCode()] );
+ res.setField3( Encoding.STATUS_MSG[res.getStatusCode()] );
}
protected void ensureContentLengthHeader( final HTTPEvent e )
{
- final HTTPMessage req = e.getHTTPRequest();
- final HTTPMessage res = e.getHTTPResponse();
+ final Message req = e.getHTTPRequest();
+ final Message res = e.getHTTPResponse();
if( contentLengthNotSet( res ) )
{
@@ -83,7 +83,7 @@
if( body.length == 0 )
{
res.addHeader(
- HTTPEncoding.HEADER_CONTENT_LENGTH_BUFFER,
+ Encoding.HEADER_CONTENT_LENGTH_BUFFER,
NioUtil.toByteBuffer( 0 )
);
}
@@ -97,53 +97,53 @@
}
res.addHeader(
- HTTPEncoding.HEADER_CONTENT_LENGTH_BUFFER,
+ Encoding.HEADER_CONTENT_LENGTH_BUFFER,
NioUtil.toByteBuffer( size )
);
}
}
}
- private boolean noBodySoNoContentLengthHeader( final HTTPMessage req,
- final HTTPMessage res )
+ private boolean noBodySoNoContentLengthHeader( final Message req,
+ final Message res )
{
- if( HTTPEncoding.METHOD_HEAD.equals( req.getField1String() ) )
+ if( Encoding.METHOD_HEAD.equals( req.getField1String() ) )
return true;
final int responseCode = res.getStatusCode();
- if( (HTTPEncoding.STATUS_100_Continue <= responseCode && responseCode < HTTPEncoding.STATUS_200_OK) ||
- responseCode == HTTPEncoding.STATUS_204_No_Content ||
- responseCode == HTTPEncoding.STATUS_304_Not_Modified )
+ if( (Encoding.STATUS_100_Continue <= responseCode && responseCode < Encoding.STATUS_200_OK) ||
+ responseCode == Encoding.STATUS_204_No_Content ||
+ responseCode == Encoding.STATUS_304_Not_Modified )
return true;
return false;
}
- protected boolean nonIdentifyTransferCodingPresent( final HTTPMessage req,
- final HTTPMessage res )
+ protected boolean nonIdentifyTransferCodingPresent( final Message req,
+ final Message res )
{
final Iterator it = res.getHeaders().iterator();
while( it.hasNext() )
{
- final HTTPField field = (HTTPField)it.next();
- if( HTTPEncoding.HEADER_TRANSFER_ENCODING.equals(
+ final Field field = (Field)it.next();
+ if( Encoding.HEADER_TRANSFER_ENCODING.equals(
field.getNameString() ) )
{
- return !HTTPEncoding.CONTENT_CODING_IDENTITY.equals(
+ return !Encoding.CONTENT_CODING_IDENTITY.equals(
field.getNameString() );
}
}
return false;
}
- protected boolean contentLengthNotSet( final HTTPMessage response )
+ protected boolean contentLengthNotSet( final Message response )
{
final Iterator it = response.getHeaders().iterator();
while( it.hasNext() )
{
- final HTTPField field = (HTTPField)it.next();
+ final Field field = (Field)it.next();
if( field.getName().equals(
- HTTPEncoding.HEADER_CONTENT_LENGTH_BUFFER ) )
+ Encoding.HEADER_CONTENT_LENGTH_BUFFER ) )
{
return false;
}
Index: AbstractStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/AbstractStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AbstractStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ AbstractStage.java 9 Apr 2004 15:52:12 -0000 1.2
@@ -27,7 +27,7 @@
import EDU.oswego.cs.dl.util.concurrent.Channel;
import junit.framework.Assert;
-import org.jicarilla.http.HTTPEncoding;
+import org.jicarilla.http.Encoding;
import org.jicarilla.http.HTTPException;
import org.jicarilla.net.Event;
import org.jicarilla.plumbing.DefaultStage;
@@ -75,7 +75,7 @@
catch( IOException ioe )
{
handleException( e,
- new HTTPException( HTTPEncoding.STATUS_999_IO_Problem,
+ new HTTPException( Encoding.STATUS_999_IO_Problem,
ioe ) );
}
}
@@ -96,7 +96,7 @@
catch( IOException ioe )
{
handleException( e,
- new HTTPException( HTTPEncoding.STATUS_999_IO_Problem,
+ new HTTPException( Encoding.STATUS_999_IO_Problem,
ioe ) );
}
Index: EchoStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/webserver/plumbing/EchoStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EchoStage.java 31 Mar 2004 12:11:00 -0000 1.1
+++ EchoStage.java 9 Apr 2004 15:52:26 -0000 1.2
@@ -26,11 +26,11 @@
package org.jicarilla.webserver.plumbing;
import EDU.oswego.cs.dl.util.concurrent.Channel;
-import org.jicarilla.http.HTTPEncoding;
+import org.jicarilla.http.Encoding;
+import org.jicarilla.http.Field;
import org.jicarilla.http.HTTPException;
-import org.jicarilla.http.HTTPField;
-import org.jicarilla.http.HTTPMessage;
-import org.jicarilla.http.HTTPMessageWriterImpl;
+import org.jicarilla.http.Message;
+import org.jicarilla.http.MessageWriterImpl;
import org.jicarilla.plumbing.Sink;
import java.io.IOException;
@@ -54,34 +54,34 @@
protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
- final HTTPMessage req = e.getHTTPRequest();
- final HTTPMessage res = e.getHTTPResponse();
+ final Message req = e.getHTTPRequest();
+ final Message res = e.getHTTPResponse();
- res.setField1( HTTPEncoding.VERSION_10 );
- res.setStatusCode( HTTPEncoding.STATUS_200_OK );
+ res.setField1( Encoding.VERSION_10 );
+ res.setStatusCode( Encoding.STATUS_200_OK );
res.setField3( "Debugging...the body should equal your request" );
res.addHeader( "Content-Type", "text/plain");
res.addBodyPart( req.getField1() );
- res.addBodyPart( HTTPMessageWriterImpl.SP );
+ res.addBodyPart( MessageWriterImpl.SP );
res.addBodyPart( req.getField2() );
- res.addBodyPart( HTTPMessageWriterImpl.SP );
+ res.addBodyPart( MessageWriterImpl.SP );
res.addBodyPart( req.getField3() );
- res.addBodyPart( HTTPMessageWriterImpl.CRLF );
+ res.addBodyPart( MessageWriterImpl.CRLF );
final Iterator it = req.getHeaders().iterator();
while( it.hasNext() )
{
- final HTTPField field = (HTTPField)it.next();
+ final Field field = (Field)it.next();
res.addBodyPart( field.getName() );
- res.addBodyPart( HTTPMessageWriterImpl.COLON_SP );
+ res.addBodyPart( MessageWriterImpl.COLON_SP );
res.addBodyPart( field.getValue() );
- res.addBodyPart( HTTPMessageWriterImpl.CRLF );
+ res.addBodyPart( MessageWriterImpl.CRLF );
}
- res.addBodyPart( HTTPMessageWriterImpl.CRLF );
+ res.addBodyPart( MessageWriterImpl.CRLF );
final ByteBuffer[] bp = req.getBodyParts();
res.addBodyParts( bp );
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click