[CVS spice] Added new web-applications for testing

sjoberg-yCVjj/[email protected] 22 Sep 2005 12:07:52 -0000
Newsgroups gmane.comp.java.spice.cvs
Message-ID <[email protected]>
<html>
<head>
<style><!--
  body {background-color:#ffffff;}
  .file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
  .pathname {font-family:monospace; float:right;}
  .fileheader {margin-bottom:.5em;}
  .diff {margin:0;}
  .tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
  .tasklist ul {margin-top:0;margin-bottom:0;}
  tr.alt {background-color:#eeeeee}
  #added {background-color:#ddffdd;}
  #addedchars {background-color:#99ff99;font-weight:bolder;}
  tr.alt #added {background-color:#ccf7cc;}
  #removed {background-color:#ffdddd;}
  #removedchars {background-color:#ff9999;font-weight:bolder;}
  tr.alt #removed {background-color:#f7cccc;}
  #info {color:#888888;}
  #context {background-color:#eeeeee;}
  td {padding-left:.3em;padding-right:.3em;}
  tr.head {border-bottom-width:1px;border-bottom-style:solid;}
  tr.head td {padding:0;padding-top:.2em;}
  .task {background-color:#ffff00;}
  .comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
  .error {color:red;}
  hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>spice/components/jervlet/testdata</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>jetty/<a href="#file1">jetty.xml</a></tt></td><td align="right" id="added">+12</td><td align="right" id="removed">-14</td><td nowrap="nowrap" align="center">1.1 -&gt; 1.2</td></tr>
<tr class="alt"><td><tt>webapps/avalon/WEB-INF/<a href="#file2"><span id="added">web.xml</span></a></tt></td><td align="right" id="added">+38</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr><td><tt>webapps/avalon/<a href="#file3"><span id="added">message.txt</span></a></tt></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr class="alt"><td><tt>webapps/dna/WEB-INF/<a href="#file4"><span id="added">web.xml</span></a></tt></td><td align="right" id="added">+38</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr><td><tt>webapps/dna/<a href="#file5"><span id="added">message.txt</span></a></tt></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr class="alt"><td><tt>webapps/pico/WEB-INF/<a href="#file6"><span id="added">web.xml</span></a></tt></td><td align="right" id="added">+38</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr><td><tt>webapps/pico/<a href="#file7"><span id="added">message.txt</span></a></tt></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr class="alt"><td><tt>webapps/plain/WEB-INF/<a href="#file8"><span id="added">web.xml</span></a></tt></td><td align="right" id="added">+38</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr><td><tt>webapps/plain/<a href="#file9"><span id="added">message.txt</span></a></tt></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr class="alt"><td><tt>webapps/template/WEB-INF/<a href="#file10"><span id="removed">web.xml</span></a></tt></td><td></td><td align="right" id="removed">-45</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr><td><tt>webapps/template/src/com/acme/<a href="#file11"><span id="removed">DemoFilter.java</span></a></tt></td><td></td><td align="right" id="removed">-44</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr class="alt"><td><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/<a href="#file12"><span id="removed">DumpServlet.java</span></a></tt></td><td></td><td align="right" id="removed">-100</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr><td><tt>webapps/template/<a href="#file13"><span id="removed">build.xml</span></a></tt></td><td></td><td align="right" id="removed">-71</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr class="alt"><td><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/<a href="#file14"><span id="removed">index.html</span></a></tt></td><td></td><td align="right" id="removed">-46</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr><td><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/<span id="removed">jetty_banner.gif</span></tt></td><td colspan="2" align="center"><small id="info">[binary]</small></td><td nowrap="nowrap">1.1 removed</td></tr>
<tr class="alt"><td><tt>webapps/<span id="added">plain.war</span></tt></td><td colspan="2" align="center"><small id="info">[binary]</small></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr><td><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/<span id="removed">template2.war</span></tt></td><td colspan="2" align="center"><small id="info">[binary]</small></td><td nowrap="nowrap">1.1 removed</td></tr>
<tr><td></td><td align="right" id="added">+168</td><td align="right" id="removed">-320</td><td></td></tr>
</table>
<small id="info">9 added + 7 removed + 1 modified, total 17 files</small><br />
<pre class="comment">
Added new web-applications for testing
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/jervlet/testdata/jetty<br /></span>
<div class="fileheader"><big><b>jetty.xml</b></big> <small id="info">1.1 -&gt; 1.2</small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- jetty.xml	5 Jul 2005 13:32:12 -0000	1.1
+++ jetty.xml	22 Sep 2005 12:07:50 -0000	1.2
@@ -52,7 +52,7 @@
</small></pre><pre class="diff" id="context">     &lt;Arg&gt;
       &lt;New class="org.mortbay.http.SocketListener"&gt;
         &lt;Set name="Port"&gt;&lt;SystemProperty name="jetty.port" default="10080"/&gt;&lt;/Set&gt;
</pre><pre class="diff" id="removed">-	&lt;Set name="PoolName"&gt;P1&lt;/Set&gt;
</pre><pre class="diff" id="added">+	<span id="addedchars">&nbsp;&nbsp;&nbsp;&nbsp;</span>&lt;Set name="PoolName"&gt;P1&lt;/Set&gt;
</pre><pre class="diff" id="context">         &lt;Set name="MinThreads"&gt;10&lt;/Set&gt;
         &lt;Set name="MaxThreads"&gt;200&lt;/Set&gt;
         &lt;Set name="MaxIdleTimeMs"&gt;30000&lt;/Set&gt;
</pre><pre class="diff"><small id="info">@@ -94,13 +94,13 @@
</small></pre><pre class="diff" id="context"> 
 
   &lt;!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --&gt;
</pre><pre class="diff" id="removed">-  &lt;!-- Add a AJP13 listener on port 1<span id="removedchars">8</span>009                              --&gt;
</pre><pre class="diff" id="added">+  &lt;!-- Add a AJP13 listener on port 1<span id="addedchars">0</span>009                              --&gt;
</pre><pre class="diff" id="context">   &lt;!-- This protocol can be used with mod_jk in apache, IIS etc.       --&gt;
   &lt;!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --&gt;
   &lt;Call name="addListener"&gt;
     &lt;Arg&gt;
       &lt;New class="org.mortbay.http.ajp.AJP13Listener"&gt;
</pre><pre class="diff" id="removed">-        &lt;Set name="Port"&gt;1<span id="removedchars">8</span>009&lt;/Set&gt;
</pre><pre class="diff" id="added">+        &lt;Set name="Port"&gt;1<span id="addedchars">0</span>009&lt;/Set&gt;
</pre><pre class="diff" id="context">         &lt;Set name="MinThreads"&gt;5&lt;/Set&gt;
         &lt;Set name="MaxThreads"&gt;20&lt;/Set&gt;
         &lt;Set name="MaxIdleTimeMs"&gt;0&lt;/Set&gt;
</pre><pre class="diff"><small id="info">@@ -148,15 +148,16 @@
</small></pre><pre class="diff" id="context">   &lt;!-- + Use the webdefault.xml resource for the defaults descriptor   --&gt;
   &lt;!-- + Upack the war file                                            --&gt;
   &lt;!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --&gt;
</pre><pre class="diff" id="added">+  &lt;!-- UNCOMMENT TO ACTIVATE
</pre><pre class="diff" id="context">   &lt;Set name="rootWebApp"&gt;root&lt;/Set&gt;
</pre><pre class="diff" id="removed">-  
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context">   &lt;Call name="addWebApplications"&gt;
     &lt;Arg&gt;&lt;/Arg&gt;
</pre><pre class="diff" id="removed">-    &lt;Arg&gt;&lt;SystemProperty name="jetty.home" default="."/&gt;/testdata/webapps/&lt;/Arg&gt;
-    &lt;Arg&gt;&lt;SystemProperty name="jetty.home" default="."/&gt;/testdata/jetty/webdefault.xml&lt;/Arg&gt;
-    &lt;Arg type="boolean"&gt;true&lt;/Arg&gt;&lt;!--extract WARs--&gt;
</pre><pre class="diff" id="added">+    &lt;Arg&gt;&lt;SystemProperty name="jetty.home" default="../.."/&gt;/testdata/webapps/&lt;/Arg&gt;
+    &lt;Arg&gt;&lt;SystemProperty name="jetty.home" default="../.."/&gt;/testdata/jetty/webdefault.xml&lt;/Arg&gt;
+    &lt;Arg type="boolean"&gt;true&lt;/Arg&gt;
</pre><pre class="diff" id="context">   &lt;/Call&gt;
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="added">+  --&gt;
</pre><pre class="diff" id="context"> 
   &lt;!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --&gt;
   &lt;!-- Add and configure a specific web application                    --&gt;
</pre><pre class="diff"><small id="info">@@ -165,10 +166,9 @@
</small></pre><pre class="diff" id="context">   &lt;!-- + Set java 2 complaint classloading                             --&gt;
   &lt;!-- + Set Virtual Hosts. A Null host or empty array means all hosts --&gt;
   &lt;!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --&gt;
</pre><pre class="diff" id="removed">-  &lt;!-- UNCOMMENT TO ACTIVATE
</pre><pre class="diff" id="context">   &lt;Call name="addWebApplication"&gt;
</pre><pre class="diff" id="removed">-    &lt;Arg&gt;/context&lt;/Arg&gt;
-    &lt;Arg&gt;./webapps/root&lt;/Arg&gt;
</pre><pre class="diff" id="added">+    &lt;Arg&gt;/plain&lt;/Arg&gt;
+    &lt;Arg&gt;../../testdata/webapps/plain&lt;/Arg&gt;
</pre><pre class="diff" id="context"> 
     &lt;Set name="extractWAR"&gt;false&lt;/Set&gt; 
     &lt;Set name="defaultsDescriptor"&gt;org/mortbay/jetty/servlet/webdefault.xml&lt;/Set&gt;
</pre><pre class="diff"><small id="info">@@ -179,18 +179,16 @@
</small></pre><pre class="diff" id="context">         &lt;Item&gt;&lt;/Item&gt;
         &lt;Item&gt;127.0.0.1&lt;/Item&gt;
         &lt;Item&gt;localhost&lt;/Item&gt;
</pre><pre class="diff" id="removed">-        &lt;Item&gt;www.acme.com&lt;/Item&gt;
</pre><pre class="diff" id="context">       &lt;/Array&gt;
     &lt;/Set&gt;
   &lt;/Call&gt;
</pre><pre class="diff" id="removed">-  --&gt;
</pre><pre class="diff" id="context"> 
   &lt;!-- =============================================================== --&gt;
   &lt;!-- Configure the Request Log                                       --&gt;
   &lt;!-- =============================================================== --&gt;
   &lt;Set name="RequestLog"&gt;
     &lt;New class="org.mortbay.http.NCSARequestLog"&gt;
</pre><pre class="diff" id="removed">-      &lt;Arg&gt;&lt;SystemProperty name="jetty.home" default="."/&gt;<span id="removedchars">/testdata/jetty/logs/</span>yyyy_mm_dd.request.log&lt;/Arg&gt;
</pre><pre class="diff" id="added">+      &lt;Arg&gt;&lt;SystemProperty name="jetty.home" default="."/&gt;yyyy_mm_dd.request.log&lt;/Arg&gt;
</pre><pre class="diff" id="context">       &lt;Set name="retainDays"&gt;90&lt;/Set&gt;
       &lt;Set name="append"&gt;true&lt;/Set&gt;
       &lt;Set name="extended"&gt;false&lt;/Set&gt;
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/avalon/WEB-INF<br /></span>
<div class="fileheader" id="added"><big><b>web.xml</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N web.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ web.xml	22 Sep 2005 12:07:50 -0000	1.1
@@ -0,0 +1,38 @@
</small></pre><pre class="diff" id="added">+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;web-app 
+   xmlns="http://java.sun.com/xml/ns/j2ee" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
+   version="2.4"&gt; 
+
+  &lt;display-name&gt;WebApp for Avalon test cases&lt;/display-name&gt;
+
+  &lt;filter&gt;
+    &lt;filter-name&gt;AvalonFilter&lt;/filter-name&gt;
+    &lt;filter-class&gt;org.codehaus.spice.jervlet.impl.avalon.AvalonTestFilter&lt;/filter-class&gt;
+  &lt;/filter&gt;
+
+  &lt;filter-mapping&gt;
+    &lt;filter-name&gt;AvalonFilter&lt;/filter-name&gt;
+    &lt;url-pattern&gt;/avalon-filter-servlet&lt;/url-pattern&gt;
+  &lt;/filter-mapping&gt;
+
+  &lt;servlet&gt;
+    &lt;servlet-name&gt;AvalonServlet&lt;/servlet-name&gt;
+    &lt;servlet-class&gt;org.codehaus.spice.jervlet.impl.avalon.AvalonTestServlet&lt;/servlet-class&gt;
+    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
+  &lt;/servlet&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;AvalonServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/avalon-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;AvalonServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/avalon-filter-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+&lt;/web-app&gt;
+
+
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/avalon<br /></span>
<div class="fileheader" id="added"><big><b>message.txt</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N message.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ message.txt	22 Sep 2005 12:07:50 -0000	1.1
@@ -0,0 +1 @@
</small></pre><pre class="diff" id="added">+avalon
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/dna/WEB-INF<br /></span>
<div class="fileheader" id="added"><big><b>web.xml</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N web.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ web.xml	22 Sep 2005 12:07:50 -0000	1.1
@@ -0,0 +1,38 @@
</small></pre><pre class="diff" id="added">+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;web-app 
+   xmlns="http://java.sun.com/xml/ns/j2ee" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
+   version="2.4"&gt; 
+
+  &lt;display-name&gt;WebApp for DNA test cases&lt;/display-name&gt;
+
+  &lt;filter&gt;
+    &lt;filter-name&gt;DNAFilter&lt;/filter-name&gt;
+    &lt;filter-class&gt;org.codehaus.spice.jervlet.impl.dna.DNATestFilter&lt;/filter-class&gt;
+  &lt;/filter&gt;
+
+  &lt;filter-mapping&gt;
+    &lt;filter-name&gt;DNAFilter&lt;/filter-name&gt;
+    &lt;url-pattern&gt;/dna-filter-servlet&lt;/url-pattern&gt;
+  &lt;/filter-mapping&gt;
+
+  &lt;servlet&gt;
+    &lt;servlet-name&gt;DNAServlet&lt;/servlet-name&gt;
+    &lt;servlet-class&gt;org.codehaus.spice.jervlet.impl.dna.DNATestServlet&lt;/servlet-class&gt;
+    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
+  &lt;/servlet&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;DNAServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/dna-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;DNAServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/dna-filter-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+&lt;/web-app&gt;
+
+
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/dna<br /></span>
<div class="fileheader" id="added"><big><b>message.txt</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N message.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ message.txt	22 Sep 2005 12:07:50 -0000	1.1
@@ -0,0 +1 @@
</small></pre><pre class="diff" id="added">+dna
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/pico/WEB-INF<br /></span>
<div class="fileheader" id="added"><big><b>web.xml</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N web.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ web.xml	22 Sep 2005 12:07:50 -0000	1.1
@@ -0,0 +1,38 @@
</small></pre><pre class="diff" id="added">+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;web-app 
+   xmlns="http://java.sun.com/xml/ns/j2ee" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
+   version="2.4"&gt; 
+
+  &lt;display-name&gt;WebApp for Pico test cases&lt;/display-name&gt;
+
+  &lt;filter&gt;
+    &lt;filter-name&gt;PicoFilter&lt;/filter-name&gt;
+    &lt;filter-class&gt;org.codehaus.spice.jervlet.impl.pico.PicoTestFilter&lt;/filter-class&gt;
+  &lt;/filter&gt;
+
+  &lt;filter-mapping&gt;
+    &lt;filter-name&gt;PicoFilter&lt;/filter-name&gt;
+    &lt;url-pattern&gt;/pico-filter-servlet&lt;/url-pattern&gt;
+  &lt;/filter-mapping&gt;
+
+  &lt;servlet&gt;
+    &lt;servlet-name&gt;PicoServlet&lt;/servlet-name&gt;
+    &lt;servlet-class&gt;org.codehaus.spice.jervlet.impl.pico.PicoTestServlet&lt;/servlet-class&gt;
+    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
+  &lt;/servlet&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;PicoServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/pico-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;PicoServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/pico-filter-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+&lt;/web-app&gt;
+
+
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/pico<br /></span>
<div class="fileheader" id="added"><big><b>message.txt</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N message.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ message.txt	22 Sep 2005 12:07:51 -0000	1.1
@@ -0,0 +1 @@
</small></pre><pre class="diff" id="added">+pico
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/plain/WEB-INF<br /></span>
<div class="fileheader" id="added"><big><b>web.xml</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N web.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ web.xml	22 Sep 2005 12:07:51 -0000	1.1
@@ -0,0 +1,38 @@
</small></pre><pre class="diff" id="added">+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+&lt;web-app 
+   xmlns="http://java.sun.com/xml/ns/j2ee" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
+   version="2.4"&gt; 
+
+  &lt;display-name&gt;WebApp for plain, standard servlet and filter test cases&lt;/display-name&gt;
+
+  &lt;filter&gt;
+    &lt;filter-name&gt;PlainFilter&lt;/filter-name&gt;
+    &lt;filter-class&gt;org.codehaus.spice.jervlet.impl.PlainTestFilter&lt;/filter-class&gt;
+  &lt;/filter&gt;
+
+  &lt;filter-mapping&gt;
+    &lt;filter-name&gt;PlainFilter&lt;/filter-name&gt;
+    &lt;url-pattern&gt;/plain-filter-servlet&lt;/url-pattern&gt;
+  &lt;/filter-mapping&gt;
+
+  &lt;servlet&gt;
+    &lt;servlet-name&gt;PlainServlet&lt;/servlet-name&gt;
+    &lt;servlet-class&gt;org.codehaus.spice.jervlet.impl.PlainTestServlet&lt;/servlet-class&gt;
+    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
+  &lt;/servlet&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;PlainServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/plain-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+  &lt;servlet-mapping&gt;
+    &lt;servlet-name&gt;PlainServlet&lt;/servlet-name&gt;
+    &lt;url-pattern&gt;/plain-filter-servlet&lt;/url-pattern&gt;
+  &lt;/servlet-mapping&gt;
+
+&lt;/web-app&gt;
+
+
</pre></div>
<hr /><a name="file9" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/testdata/webapps/plain<br /></span>
<div class="fileheader" id="added"><big><b>message.txt</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N message.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ message.txt	22 Sep 2005 12:07:51 -0000	1.1
@@ -0,0 +1 @@
</small></pre><pre class="diff" id="added">+plain
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file10" /><div class="file">
<span class="pathname" id="removed">spice/components/jervlet/testdata/webapps/template/WEB-INF<br /></span>
<div class="fileheader" id="removed"><big><b>web.xml</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N web.xml
--- web.xml	5 Jul 2005 13:32:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
</small></pre><pre class="diff" id="removed">-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;web-app 
-   xmlns="http://java.sun.com/xml/ns/j2ee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
-   version="2.4"&gt; 
-
-  &lt;display-name&gt;Template WebApp&lt;/display-name&gt;
-
-&lt;!--
-  &lt;filter&gt;
-    &lt;filter-name&gt;Filter&lt;/filter-name&gt;
-    &lt;filter-class&gt;com.acme.DemoFilter&lt;/filter-class&gt;
-  &lt;/filter&gt;
-
-  &lt;filter-mapping&gt;
-    &lt;filter-name&gt;Filter&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/&lt;/url-pattern&gt;
-  &lt;/filter-mapping&gt;
-
-  &lt;servlet&gt;
-    &lt;servlet-name&gt;Dump&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;com.acme.DumpServlet&lt;/servlet-class&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-  &lt;/servlet&gt;
-
-  &lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;Dump&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;/dump/*&lt;/url-pattern&gt;
-  &lt;/servlet-mapping&gt;
-
-  &lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;Dump&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;*.dump&lt;/url-pattern&gt;
-  &lt;/servlet-mapping&gt;
-
-  &lt;error-page&gt;
-    &lt;error-code&gt;404&lt;/error-code&gt;
-    &lt;location&gt;/dump/ERROR&lt;/location&gt;
-  &lt;/error-page&gt;
---&gt;
-
-&lt;/web-app&gt;
-
-
</pre></div>
<hr /><a name="file11" /><div class="file">
<span class="pathname" id="removed">spice/components/jervlet/testdata/webapps/template/src/com/acme<br /></span>
<div class="fileheader" id="removed"><big><b>DemoFilter.java</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N DemoFilter.java
--- DemoFilter.java	5 Jul 2005 13:32:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
</small></pre><pre class="diff" id="removed">-// ===========================================================================
-// Copyright (c) 1996-2003 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: DemoFilter.java,v 1.1 2005/07/05 13:32:14 proyal Exp $
-// ---------------------------------------------------------------------------
-
-package com.acme;
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-
-/* ------------------------------------------------------------ */
-public  class DemoFilter implements Filter
-{
-    private FilterConfig config;
-	
-    /* ------------------------------------------------------------ */
-    public void init(FilterConfig filterConfig)
-        throws ServletException
-    {
-        config=filterConfig;
-    }
-
-    /* ------------------------------------------------------------ */
-    public void doFilter(ServletRequest request,
-                         ServletResponse response,
-                         FilterChain chain)
-	throws IOException, ServletException
-    {
-        // Do your funky filter thang here ...
-        chain.doFilter(request, response);   
-    }
-
-    /* ------------------------------------------------------------ */
-    public void destroy()
-    {
-    }
-}
-
</pre></div>
<hr /><a name="file12" /><div class="file">
<span class="pathname" id="removed">spice/components/jervlet/testdata/webapps/template/src/com/acme<br /></span>
<div class="fileheader" id="removed"><big><b>DumpServlet.java</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N DumpServlet.java
--- DumpServlet.java	5 Jul 2005 13:32:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
</small></pre><pre class="diff" id="removed">-package com.acme;
-
-import java.io.*;
-import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class DumpServlet extends HttpServlet
-{
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException,
-            ServletException
-    {
-        String furi = (String) request.getAttribute("javax.servlet.forward.request_uri");
-        if (furi == null) furi = request.getRequestURI();
-        String url = request.getScheme() + "://" + request.getServerName() + ":"
-                + request.getServerPort() + furi;
-
-        String uri = (String) request.getAttribute("javax.servlet.forward.request_uri");
-        if (uri == null) uri = request.getRequestURI();
-
-        String servlet = (String) request.getAttribute("javax.servlet.include.servlet_path");
-        if (servlet == null) servlet = request.getServletPath();
-
-        String info = (String) request.getAttribute("javax.servlet.include.path_info");
-        if (info == null) info = request.getPathInfo();
-
-        PrintWriter out = null;
-        try
-        {
-            out = new PrintWriter(new OutputStreamWriter(response.getOutputStream()));
-        }
-        catch (IllegalStateException e)
-        {
-            out = response.getWriter();
-        }
-
-        String referer = request.getHeader("referer");
-        response.setContentType("text/html");
-
-        out.write("&lt;html&gt;&lt;body&gt;");
-        out.write("&lt;h1&gt;Dump from " + getServletContext().getServerInfo() + "&lt;/h1&gt;");
-        out.write("&lt;h3&gt;Logical Values&lt;/h3&gt;");
-        out.write("&lt;table border=\"1\"&gt;&lt;tr&gt;&lt;th&gt;Name&lt;/th&gt;&lt;th&gt;Value&lt;/th&gt;&lt;th&gt;Expected Value&lt;/th&gt;&lt;/tr&gt;");
-        out.write("&lt;tr&gt;&lt;td&gt;Client URL&lt;/td&gt;&lt;td&gt;" + url
-                + "&lt;/td&gt;&lt;td&gt;Same as browser location bar&lt;/td&gt;&lt;/tr&gt;");
-        out.write("&lt;tr&gt;&lt;td&gt;Client URI&lt;/td&gt;&lt;td&gt;" + uri
-                + "&lt;/td&gt;&lt;td&gt;Tail of browser location bar&lt;/td&gt;&lt;/tr&gt;");
-        out.write("&lt;tr&gt;&lt;td&gt;This Servlet&lt;/td&gt;&lt;td&gt;" + servlet + "&lt;/td&gt;&lt;td&gt;/dump&lt;/td&gt;&lt;/tr&gt;");
-        out.write("&lt;tr&gt;&lt;td&gt;This Info&lt;/td&gt;&lt;td&gt;" + info + "&lt;/td&gt;&lt;td&gt;/info&lt;/td&gt;&lt;/tr&gt;");
-        out.write("&lt;/table&gt;");
-
-        // loop over all wrappers
-        ServletRequest sr = request;
-
-        while (sr != null)
-        {
-            out.write("&lt;h3&gt;" + sr.getClass() + ":" + sr.hashCode() + "&lt;/h3&gt;");
-
-            out.write("&lt;table border=\"1\"&gt;&lt;tr&gt;&lt;th&gt;Name&lt;/th&gt;&lt;th&gt;Value&lt;/th&gt;&lt;/tr&gt;");
-            out.write("&lt;tr&gt;&lt;td&gt;getScheme()&lt;/td&gt;&lt;td&gt;" + sr.getScheme() + "&lt;/td&gt;&lt;/tr&gt;");
-            out.write("&lt;tr&gt;&lt;td&gt;getServerName()&lt;/td&gt;&lt;td&gt;" + sr.getServerName() + "&lt;/td&gt;&lt;/tr&gt;");
-            out.write("&lt;tr&gt;&lt;td&gt;getServlerPort()&lt;/td&gt;&lt;td&gt;" + sr.getServerPort() + "&lt;/td&gt;&lt;/tr&gt;");
-
-            if (sr instanceof HttpServletRequest)
-            {
-                HttpServletRequest hsr = (HttpServletRequest) sr;
-
-                out.write("&lt;tr&gt;&lt;td&gt;getRequestURL()&lt;/td&gt;&lt;td&gt;" + hsr.getRequestURL() + "&lt;/td&gt;&lt;/tr&gt;");
-                out.write("&lt;tr&gt;&lt;td&gt;getRequestURI()&lt;/td&gt;&lt;td&gt;" + hsr.getRequestURI() + "&lt;/td&gt;&lt;/tr&gt;");
-                out.write("&lt;tr&gt;&lt;td&gt;getContextPath()&lt;/td&gt;&lt;td&gt;" + hsr.getContextPath()
-                                + "&lt;/td&gt;&lt;/tr&gt;");
-                out.write("&lt;tr&gt;&lt;td&gt;getServletPath()&lt;/td&gt;&lt;td&gt;" + hsr.getServletPath()
-                                + "&lt;/td&gt;&lt;/tr&gt;");
-                out.write("&lt;tr&gt;&lt;td&gt;getPathInfo()&lt;/td&gt;&lt;td&gt;" + hsr.getPathInfo() + "&lt;/td&gt;&lt;/tr&gt;");
-            }
-
-            Enumeration e = sr.getAttributeNames();
-            while (e.hasMoreElements())
-            {
-                String name = (String) e.nextElement();
-                out.write("&lt;tr&gt;&lt;td&gt;getAttribute(\"" + name + "\")&lt;/td&gt;&lt;td&gt;" + sr.getAttribute(name)
-                        + "&lt;/td&gt;&lt;/tr&gt;");
-            }
-            out.write("&lt;/table&gt;");
-
-            if (sr instanceof ServletRequestWrapper)
-                sr = ((ServletRequestWrapper) sr).getRequest();
-            else
-                sr = null;
-        }
-
-        if (referer != null) out.write("&lt;p&gt;&lt;a href=\"" + referer + "\"&gt;BACK&lt;/a&gt;&lt;/p&gt;");
-        out.write("&lt;/body&gt;&lt;/html&gt;");
-        out.flush();
-    }
-}
</pre></div>
<hr /><a name="file13" /><div class="file">
<span class="pathname" id="removed">spice/components/jervlet/testdata/webapps/template<br /></span>
<div class="fileheader" id="removed"><big><b>build.xml</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N build.xml
--- build.xml	5 Jul 2005 13:32:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
</small></pre><pre class="diff" id="removed">-
-&lt;project name="template" default="classes" basedir="."&gt;
-
-  &lt;property name="src"            value="${basedir}/src"/&gt;
-  &lt;property name="webinf"         value="${basedir}/WEB-INF"/&gt;
-  &lt;property name="webinf.lib"     value="${webinf}/lib"/&gt;
-  &lt;property name="webinf.classes" value="${webinf}/classes"/&gt;
-  &lt;property name="lib"            value="${basedir}/../../lib" /&gt;
-  &lt;property name="ext"            value="${basedir}/../../ext" /&gt;
-  &lt;property name="war"            value="${basedir}/../${ant.project.name}.war" /&gt;
-  &lt;property name="javac.debug"    value="true" /&gt;
-  &lt;property name="javac.optimize" value="true" /&gt;
-  &lt;property name="javac.deprecation" value="true" /&gt;
-
-
-  &lt;target name="classpath"&gt;
-    &lt;mkdir dir="${webinf.lib}"/&gt; 
-    &lt;path id="classpath"&gt;
-      &lt;fileset dir="${webinf.lib}"&gt;
-        &lt;include name="*.jar"/&gt;
-      &lt;/fileset&gt;
-      &lt;fileset dir="${lib}"&gt;
-        &lt;include name="*.jar"/&gt;
-      &lt;/fileset&gt;
-      &lt;fileset dir="${ext}"&gt;
-        &lt;include name="*.jar"/&gt;
-      &lt;/fileset&gt;
-    &lt;/path&gt;
-
-    &lt;property name="expanded.classpath" refid="classpath"/&gt;
-    &lt;echo message="classpath=${expanded.classpath}" level="info"/&gt;
- &lt;/target&gt;
-
-
-  &lt;target name="classes" depends="classpath" description="Compile classes"&gt;
-    &lt;mkdir dir="${webinf.classes}"/&gt; 
-    &lt;javac srcdir="${src}"
-           destdir="${webinf.classes}"
-           debug="${javac.debug}"
-           optimize="${javac.optimize}"
-           deprecation="${javac.deprecation}"
-           &gt;
-       &lt;classpath&gt;
-         &lt;path refid="classpath"/&gt;
-       &lt;/classpath&gt;
-
-       &lt;include name="**/*.java"/&gt;
-    &lt;/javac&gt;
-  &lt;/target&gt;
-
-  &lt;target name="war" depends="classes" description="build WAR"&gt; 
-    &lt;war destfile="${war}"
-         webxml="${webinf}/web.xml"
-         basedir="${basedir}"&gt;
-      &lt;exclude name="build.xml"/&gt;
-      &lt;exclude name="WEB-INF/web.xml"/&gt;
-      &lt;exclude name="**/CVS/**"/&gt;
-      &lt;exclude name="src/**"/&gt;
-    &lt;/war&gt;
-  &lt;/target&gt;
-
-  &lt;target name="clean" description="Remove generated files"&gt; 
-    &lt;delete file="${war}" quiet="false"/&gt;
-    &lt;delete dir="${webinf.classes}"/&gt;
-    &lt;delete dir="${webinf.lib}"/&gt;
-  &lt;/target&gt;
-
-&lt;/project&gt;
-
-
-
</pre></div>
<hr /><a name="file14" /><div class="file">
<span class="pathname" id="removed">spice/components/jervlet/testdata/webapps/template<br /></span>
<div class="fileheader" id="removed"><big><b>index.html</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N index.html
--- index.html	5 Jul 2005 13:32:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
</small></pre><pre class="diff" id="removed">-&lt;HTML&gt;
-  &lt;HEAD&gt;
-    &lt;TITLE&gt;Powered By Jetty&lt;/TITLE&gt;
-    &lt;META http-equiv="Pragma" content="no-cache"&gt;
-    &lt;META http-equiv="Cache-Control" content="no-cache,no-store"&gt;
-  &lt;/HEAD&gt;
-&lt;BODY&gt;
-&lt;A HREF="http://jetty.mortbay.org"&gt;&lt;IMG SRC="jetty_banner.gif"&gt;&lt;/A&gt;
-&lt;P&gt;
-This is a template web application context, which can be used as the
-basis of your own web application.  It contains some static content
-and a &lt;a href="dump"&gt;Dump Servlet&lt;/a&gt;.
-It's location is $JETTY_HOME/webapps/template.
-&lt;p&gt;
-If you want to see a full demonstration of Jetty, then you will need 
-to have either the Jetty-5.0.x-extra or Jetty-5.0.x-all package installed.
-You will then be able to run the demo with:&lt;PRE&gt;
-  java -jar start.jar etc/admin.xml etc/demo.xml
-&lt;/PRE&gt;
-&lt;p&gt;
-For a standard installation of Jetty, the &lt;a href="/javadoc"&gt;javadoc&lt;/a&gt;
-will be available.
-&lt;p&gt;
-If this server was started with the etc/admin.xml configuration, then
-a &lt;A href="http://localhost:8081"&gt;simple admin UI&lt;/a&gt; may be
-available (default username/password is admin/admin).
-&lt;p&gt;
-If this server was started via JMX, then a 
-&lt;A href="http://localhost:8082"&gt;JMX console UI&lt;/a&gt; should be available.
-To start Jetty with JMX use:  &lt;PRE&gt;
-  java -Dstart.class=org.mortbay.util.jmx.Main -jar start.jar etc/jetty.mlet
-&lt;/PRE&gt;
-
-To start a server using the jars and resource in the extra packages, use:
-&lt;PRE&gt;
-java -DSTART=extra/etc/start.config -jar start.jar
-&lt;/PRE&gt;
-or
-&lt;PRE&gt;
-java -Dmain.class=org.mortbay.jetty.plus.Server -DSTART=extra/etc/start.config -jar start.jar
-&lt;/PRE&gt;
-
-
-
-&lt;/BODY&gt;
-&lt;/HTML&gt;
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -&gt; email">CVSspam</a> 0.2.8</small></center>
</body></html>