[CVS spice] Cleanup
sjoberg-yCVjj/[email protected] 19 Oct 2005 15:11:43 -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</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>src/java/org/codehaus/spice/jervlet/impl/pico/<a href="#file1">PicoInstantiator.java</a></tt></td><td></td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
<tr class="alt"><td><tt>src/test/org/codehaus/spice/jervlet/containers/jetty/avalon/<a href="#file2">AvalonJettyContainerTestCase.java</a></tt></td><td align="right" id="added">+9</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">1.3 -> 1.4</td></tr>
<tr><td><tt>src/test/org/codehaus/spice/jervlet/containers/jetty/pico/<a href="#file3">PicoJettyContainerTestCase.java</a></tt></td><td align="right" id="added">+6</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">1.5 -> 1.6</td></tr>
<tr class="alt"><td><tt>src/test/org/codehaus/spice/jervlet/containers/jetty/<a href="#file4">ShieldingJettyContainerTestCase.java</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">1.3 -> 1.4</td></tr>
<tr><td><tt>testdata/jetty/<a href="#file5">jetty.xml</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-11</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
<tr><td></td><td align="right" id="added">+18</td><td align="right" id="removed">-23</td><td></td></tr>
</table>
<small id="info">5 modified files</small><br />
<pre class="comment">
Cleanup
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/jervlet/src/java/org/codehaus/spice/jervlet/impl/pico<br /></span>
<div class="fileheader"><big><b>PicoInstantiator.java</b></big> <small id="info">1.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- PicoInstantiator.java 19 Oct 2005 14:50:56 -0000 1.2
+++ PicoInstantiator.java 19 Oct 2005 15:11:42 -0000 1.3
@@ -58,7 +58,6 @@
</small></pre><pre class="diff" id="context"> package org.codehaus.spice.jervlet.impl.pico;
import org.picocontainer.MutablePicoContainer;
</pre><pre class="diff" id="removed">-import org.picocontainer.ComponentAdapter;
</pre><pre class="diff" id="context"> import org.codehaus.spice.jervlet.Instantiator;
/**
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">spice/components/jervlet/src/test/org/codehaus/spice/jervlet/containers/jetty/avalon<br /></span>
<div class="fileheader"><big><b>AvalonJettyContainerTestCase.java</b></big> <small id="info">1.3 -> 1.4</small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- AvalonJettyContainerTestCase.java 22 Sep 2005 12:12:06 -0000 1.3
+++ AvalonJettyContainerTestCase.java 19 Oct 2005 15:11:42 -0000 1.4
@@ -22,8 +22,14 @@
</small></pre><pre class="diff" id="context"> */
public class AvalonJettyContainerTestCase extends TestCase
{
</pre><pre class="diff" id="removed">- private static final String m_<span id="removedchars">default</span>Configuration =
</pre><pre class="diff" id="added">+ private static final String m_<span id="addedchars">jetty</span>Configuration =
</pre><pre class="diff" id="context"> "../../testdata/jetty/jetty.xml";
</pre><pre class="diff" id="added">+ private static final String m_plainWebapp =
+ "../../testdata/webapps/plain";
+ private static final String m_plainWebappWAR =
+ "../../testdata/webapps/plain.war";
+ private static final String m_avalonWebapp =
+ "../../testdata/webapps/avalon";
</pre><pre class="diff" id="context">
/**
* Create an empty container and start/stop it.
</pre><pre class="diff"><small id="info">@@ -47,7 +53,7 @@
</small></pre><pre class="diff" id="context"> public void testDefaultConfigurationFile() throws Exception
{
AvalonJettyContainer container =
</pre><pre class="diff" id="removed">- getContainer( getStringConfiguration( m_<span id="removedchars">default</span>Configuration ) );
</pre><pre class="diff" id="added">+ getContainer( getStringConfiguration( m_<span id="addedchars">jetty</span>Configuration ) );
</pre><pre class="diff" id="context"> container.start();
container.stop();
}
</pre><pre class="diff"><small id="info">@@ -63,7 +69,7 @@
</small></pre><pre class="diff" id="context"> Properties properties = new Properties();
properties.setProperty( "jetty.port", "8421" );
AvalonJettyContainer container =
</pre><pre class="diff" id="removed">- getContainer( getPropertiesConfiguration( m_<span id="removedchars">default</span>Configuration, properties ) );
</pre><pre class="diff" id="added">+ getContainer( getPropertiesConfiguration( m_<span id="addedchars">jetty</span>Configuration, properties ) );
</pre><pre class="diff" id="context"> container.start();
container.stop();
}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">spice/components/jervlet/src/test/org/codehaus/spice/jervlet/containers/jetty/pico<br /></span>
<div class="fileheader"><big><b>PicoJettyContainerTestCase.java</b></big> <small id="info">1.5 -> 1.6</small></div>
<pre class="diff"><small id="info">diff -u -r1.5 -r1.6
--- PicoJettyContainerTestCase.java 23 Sep 2005 08:17:31 -0000 1.5
+++ PicoJettyContainerTestCase.java 19 Oct 2005 15:11:42 -0000 1.6
@@ -39,7 +39,7 @@
</small></pre><pre class="diff" id="context"> */
public class PicoJettyContainerTestCase extends TestCase
{
</pre><pre class="diff" id="removed">- private static final String m_<span id="removedchars">default</span>Configuration =
</pre><pre class="diff" id="added">+ private static final String m_<span id="addedchars">jetty</span>Configuration =
</pre><pre class="diff" id="context"> "../../testdata/jetty/jetty.xml";
private static final String m_plainWebapp =
"../../testdata/webapps/plain";
</pre><pre class="diff"><small id="info">@@ -79,8 +79,8 @@
</small></pre><pre class="diff" id="context"> }
/**
</pre><pre class="diff" id="removed">- * Create a container with the default configuration file
- * that comes with Jetty, and start/stop the container.
</pre><pre class="diff" id="added">+ * Create a container with a Jetty configuration file
+ * and start/stop the it.
</pre><pre class="diff" id="context"> *
* @throws Exception
*/
</pre><pre class="diff"><small id="info">@@ -88,7 +88,7 @@
</small></pre><pre class="diff" id="context"> {
DefaultJettyContainerConfiguration configuration =
new DefaultJettyContainerConfiguration();
</pre><pre class="diff" id="removed">- configuration.setConfiguration( m_<span id="removedchars">default</span>Configuration );
</pre><pre class="diff" id="added">+ configuration.setConfiguration( m_<span id="addedchars">jetty</span>Configuration );
</pre><pre class="diff" id="context"> PicoJettyContainer container = new PicoJettyContainer( configuration,
null,
null );
</pre><pre class="diff"><small id="info">@@ -116,7 +116,7 @@
</small></pre><pre class="diff" id="context">
/**
* Create a container with one property (jetty.port) and
</pre><pre class="diff" id="removed">- * start/stop it using the default configuration.
</pre><pre class="diff" id="added">+ * start/stop it using a Jetty configuration file.
</pre><pre class="diff" id="context"> *
* @throws Exception
*/
</pre><pre class="diff"><small id="info">@@ -127,7 +127,7 @@
</small></pre><pre class="diff" id="context">
DefaultJettyContainerConfiguration configuration =
new DefaultJettyContainerConfiguration();
</pre><pre class="diff" id="removed">- configuration.setConfiguration( (new File( m_<span id="removedchars">default</span>Configuration )).toURL() );
</pre><pre class="diff" id="added">+ configuration.setConfiguration( (new File( m_<span id="addedchars">jetty</span>Configuration )).toURL() );
</pre><pre class="diff" id="context"> configuration.setProperties( properties );
PicoJettyContainer container = new PicoJettyContainer( configuration,
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">spice/components/jervlet/src/test/org/codehaus/spice/jervlet/containers/jetty<br /></span>
<div class="fileheader"><big><b>ShieldingJettyContainerTestCase.java</b></big> <small id="info">1.3 -> 1.4</small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- ShieldingJettyContainerTestCase.java 22 Sep 2005 22:25:41 -0000 1.3
+++ ShieldingJettyContainerTestCase.java 19 Oct 2005 15:11:42 -0000 1.4
@@ -183,9 +183,8 @@
</small></pre><pre class="diff" id="context"> container.stop();
}
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> /**
</pre><pre class="diff" id="removed">- * Test if pico-servlet components get<span id="removedchars">s</span> instantiated
</pre><pre class="diff" id="added">+ * Test if pico-servlet components get instantiated
</pre><pre class="diff" id="context"> *
* @throws Exception on all errors
*/
</pre></div>
<hr /><a name="file5" /><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.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- jetty.xml 22 Sep 2005 12:07:50 -0000 1.2
+++ jetty.xml 19 Oct 2005 15:11:42 -0000 1.3
@@ -52,7 +52,7 @@
</small></pre><pre class="diff" id="context"> <Arg>
<New class="org.mortbay.http.SocketListener">
<Set name="Port"><SystemProperty name="jetty.port" default="10080"/></Set>
</pre><pre class="diff" id="removed">- <span id="removedchars"> </span><Set name="PoolName">P1</Set>
</pre><pre class="diff" id="added">+ <Set name="PoolName">P1</Set>
</pre><pre class="diff" id="context"> <Set name="MinThreads">10</Set>
<Set name="MaxThreads">200</Set>
<Set name="MaxIdleTimeMs">30000</Set>
</pre><pre class="diff"><small id="info">@@ -202,13 +202,4 @@
</small></pre><pre class="diff" id="context"> <Set name="requestsPerGC">2000</Set>
<Set name="statsOn">false</Set>
<Set class="org.mortbay.util.FileResource" name="checkAliases" type="boolean">true</Set>
</pre><pre class="diff" id="removed">-</Configure>
-
-
-
-
-
-
-
-
-
</pre><pre class="diff" id="added">+</Configure>
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.8</small></center>
</body></html>