Author: costin
Date: Tue Mar 25 21:12:31 2008
New Revision: 641137
URL: http://svn.apache.org/viewvc?rev=641137&view=rev
Log:
Added missing file, few small corrections and eol
Added:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java
(with props)
Modified:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/ClientAbortException.java
(props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java
(contents, props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/EchoAdapter.java
(props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MapperAdapter.java
(props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageReader.java
(props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java
(contents, props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java
(contents, props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/StaticAdapter.java
(props changed)
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/StaticMain.java
(props changed)
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/ClientAbortException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java?rev=641137&view=auto
==============================================================================
---
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java
(added)
+++
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java
Tue Mar 25 21:12:31 2008
@@ -0,0 +1,34 @@
+package org.apache.coyote.adapters;
+
+import org.apache.coyote.Adapter;
+import org.apache.tomcat.util.IntrospectionUtils;
+
+
+
+/**
+ * Serve a static resource, all in RAM. This should be the fastest way to
+ * send data over HTTP with tomcat - no overhead except the coyote layer.
+ *
+ * Used to benchmark and for files/resources that are extremely popular.
+ */
+public class CoyoteMain extends CoyoteServer {
+ static Adapter fileAdapter = new SimpleFileAdapter();
+
+ public CoyoteMain() {
+ }
+
+ protected void initAdapters() {
+ addAdapter("/", fileAdapter);
+ }
+
+ // ------------------- Main ---------------------
+ public static void main( String args[]) throws Exception {
+ CoyoteMain sa=new CoyoteMain();
+ IntrospectionUtils.processArgs(sa, args);
+ IntrospectionUtils.processArgs(fileAdapter, args);
+ sa.setArgs(args);
+ sa.run();
+ }
+
+
+}
\ No newline at end of file
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java?rev=641137&r1=641136&r2=641137&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java
(original)
+++
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java
Tue Mar 25 21:12:31 2008
@@ -56,7 +56,11 @@
adapter = new MapperAdapter();
((MapperAdapter) adapter).setDefaultAdapter(oldDefault);
}
- ((MapperAdapter) adapter).getMapper().addWrapper(path, added);
+ if ("/".equals(path)) {
+ ((MapperAdapter) adapter).setDefaultAdapter(added);
+ } else {
+ ((MapperAdapter) adapter).getMapper().addWrapper(path, added);
+ }
}
}
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/EchoAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MapperAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java?rev=641137&r1=641136&r2=641137&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java
(original)
+++
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java
Tue Mar 25 21:12:31 2008
@@ -676,5 +676,8 @@
return out;
}
+ public ByteChunk getByteBuffer() {
+ return outputChunk;
+ }
}
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java?rev=641137&r1=641136&r2=641137&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java
(original)
+++
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java
Tue Mar 25 21:12:31 2008
@@ -32,6 +32,7 @@
public void setBaseDir(String s) {
baseDir = s;
+ init();
}
public void init() {
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/StaticAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/StaticMain.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
