[CVS spice] sensible rename
paul-yCVjj/[email protected] 23 Sep 2005 00:55:34 -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/src/java/org/codehaus/spice/jervlet/impl/pico</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1"><span id="added">JervletNodeBuilderDecorationDelegate.java</span></a></tt></td><td align="right" id="added">+67</td><td></td><td nowrap="nowrap" align="right">added 1.1</td></tr>
<tr class="alt"><td><tt><a href="#file2"><span id="removed">JervletNanoContainerBuilderDecorationDelegate.java</span></a></tt></td><td></td><td align="right" id="removed">-67</td><td nowrap="nowrap">1.5 removed</td></tr>
<tr><td></td><td align="right" id="added">+67</td><td align="right" id="removed">-67</td><td></td></tr>
</table>
<small id="info">1 added + 1 removed, total 2 files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO check parent is a NanoContainer TDD-style</a></li>
<li><a href="#task2">TODO should likely attempt as a URL, then if that fails, treat as a file (relative to working dir)</a></li>
</ul></div>
<pre class="comment">
sensible rename
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname" id="added">spice/components/jervlet/src/java/org/codehaus/spice/jervlet/impl/pico<br /></span>
<div class="fileheader" id="added"><big><b>JervletNodeBuilderDecorationDelegate.java</b></big> <small id="info">added at 1.1</small></div>
<pre class="diff"><small id="info">diff -N JervletNodeBuilderDecorationDelegate.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ JervletNodeBuilderDecorationDelegate.java 23 Sep 2005 00:55:34 -0000 1.1
@@ -0,0 +1,67 @@
</small></pre><pre class="diff" id="added">+/*
+ * Copyright (C) The Spice Group. All rights reserved.
+ *
+ * This software is published under the terms of the Spice
+ * Software License version 1.1, a copy of which has been included
+ * with this distribution in the LICENSE.txt file.
+ */
+package org.codehaus.spice.jervlet.impl.pico;
+
+import org.codehaus.spice.jervlet.containers.jetty.pico.PicoJettyContainer;
+import org.nanocontainer.NanoContainer;
+import org.nanocontainer.script.NanoContainerMarkupException;
+import org.nanocontainer.script.NullNodeBuilderDecorationDelegate;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.Parameter;
+import org.picocontainer.defaults.ComponentParameter;
+import org.picocontainer.defaults.ConstantParameter;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:[email protected]">peter royal</a>
+ */
+public class JervletNodeBuilderDecorationDelegate extends NullNodeBuilderDecorationDelegate
+{
+ public Object createNode( Object name, Map attributes, Object parent )
+ {
<a name="task1" />+ //<span class="task">TODO</span> check parent is a NanoContainer TDD-style
+ if( "webserver".equals( name ) )
+ {
+ MutablePicoContainer pico = ( (NanoContainer)parent ).getPico();
+
+ pico.registerComponentImplementation( PicoJettyContainer.class );
+ pico.registerComponentImplementation( PicoDefaultContextHandler.class );
+
+ return null;
+ }
+ else if( "webapp".equals( name ) )
+ {
+ MutablePicoContainer pico = ( (NanoContainer)parent ).getPico();
+ String context = (String)attributes.remove( "context" );
<a name="task2" />+ //<span class="task">TODO</span> should likely attempt as a URL, then if that fails, treat as a file (relative to working dir)
+ String warPath = (String)attributes.remove( "warPath" );
+
+ try
+ {
+ pico.registerComponentImplementation(
+ PicoContext.class,
+ PicoContext.class,
+ new Parameter[]{new ComponentParameter(),
+ new ConstantParameter( context ),
+ new ConstantParameter( new File( warPath ).toURL() ),
+ new ConstantParameter( new PicoInstantiator( pico ) )} );
+ }
+ catch( MalformedURLException e )
+ {
+ throw new NanoContainerMarkupException("Malformed warPath: " + warPath, e );
+ }
+
+ return null;
+ }
+
+ return super.createNode( name, attributes, parent );
+ }
+}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="removed">spice/components/jervlet/src/java/org/codehaus/spice/jervlet/impl/pico<br /></span>
<div class="fileheader" id="removed"><big><b>JervletNanoContainerBuilderDecorationDelegate.java</b></big> <small id="info">removed after 1.5</small></div>
<pre class="diff"><small id="info">diff -N JervletNanoContainerBuilderDecorationDelegate.java
--- JervletNanoContainerBuilderDecorationDelegate.java 23 Sep 2005 00:47:16 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
</small></pre><pre class="diff" id="removed">-/*
- * Copyright (C) The Spice Group. All rights reserved.
- *
- * This software is published under the terms of the Spice
- * Software License version 1.1, a copy of which has been included
- * with this distribution in the LICENSE.txt file.
- */
-package org.codehaus.spice.jervlet.impl.pico;
-
-import org.codehaus.spice.jervlet.containers.jetty.pico.PicoJettyContainer;
-import org.nanocontainer.NanoContainer;
-import org.nanocontainer.script.NanoContainerMarkupException;
-import org.nanocontainer.script.NullNodeBuilderDecorationDelegate;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.Parameter;
-import org.picocontainer.defaults.ComponentParameter;
-import org.picocontainer.defaults.ConstantParameter;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:[email protected]">peter royal</a>
- */
-public class JervletNanoContainerBuilderDecorationDelegate extends NullNodeBuilderDecorationDelegate
-{
- public Object createNode( Object name, Map attributes, Object parent )
- {
- //TODO check parent is a NanoContainer TDD-style
- if( "webserver".equals( name ) )
- {
- MutablePicoContainer pico = ( (NanoContainer)parent ).getPico();
-
- pico.registerComponentImplementation( PicoJettyContainer.class );
- pico.registerComponentImplementation( PicoDefaultContextHandler.class );
-
- return null;
- }
- else if( "webapp".equals( name ) )
- {
- MutablePicoContainer pico = ( (NanoContainer)parent ).getPico();
- String context = (String)attributes.remove( "context" );
- //TODO should likely attempt as a URL, then if that fails, treat as a file (relative to working dir)
- String warPath = (String)attributes.remove( "warPath" );
-
- try
- {
- pico.registerComponentImplementation(
- PicoContext.class,
- PicoContext.class,
- new Parameter[]{new ComponentParameter(),
- new ConstantParameter( context ),
- new ConstantParameter( new File( warPath ).toURL() ),
- new ConstantParameter( new PicoInstantiator( pico ) )} );
- }
- catch( MalformedURLException e )
- {
- throw new NanoContainerMarkupException("Malformed warPath: " + warPath, e );
- }
-
- return null;
- }
-
- return super.createNode( name, attributes, parent );
- }
-}
</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>