You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/03/25 14:43:43 UTC
svn commit: r388756 - in /cocoon/trunk/cocoon-blocks-fw:
cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/
cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/
cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/...
Author: danielf
Date: Sat Mar 25 05:43:42 2006
New Revision: 388756
URL: http://svn.apache.org/viewcvs?rev=388756&view=rev
Log:
Moved the interface Block to cocoon-blocks-fw-servlet-impl. Removed various System.out.println. Fixed faulty implementation of getOutputStream and getWriter in BlockCallHttpServletResponse. Proper closing of all streams in the test servlets.
Added:
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Block.java
- copied, changed from r387330, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Block.java
Removed:
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Block.java
Modified:
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Activator.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockConnection.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet2.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Blocks.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksContext.java
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Activator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Activator.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Activator.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Activator.java Sat Mar 25 05:43:42 2006
@@ -37,12 +37,10 @@
protected void setLog(LogService logService) {
this.log = logService;
- System.out.println("Got log");
}
protected void setHttpService(HttpService httpService) {
this.httpService = httpService;
- System.out.println("Got http service");
}
protected void setServlet(ServiceReference reference)
@@ -66,12 +64,10 @@
protected void activate(ComponentContext context) {
this.context = context;
- System.out.println("Cocoon Start");
this.log.log(LogService.LOG_DEBUG, "Cocoon start");
}
protected void deactivate(ComponentContext context) {
- System.out.println("Cocoon Stop");
this.log.log(LogService.LOG_DEBUG, "Cocoon stop");
}
}
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockConnection.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockConnection.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockConnection.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockConnection.java Sat Mar 25 05:43:42 2006
@@ -110,9 +110,6 @@
this.response.flushBuffer();
byte[] out = os.toByteArray();
- System.out.print("BlockConnection:" + out.length + "[");
- System.out.write(out, 0, out.length);
- System.out.println("]");
return new ByteArrayInputStream(out);
} catch (ServletException e) {
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/BlockContext.java Sat Mar 25 05:43:42 2006
@@ -41,6 +41,8 @@
* @version $Id$
*/
public class BlockContext extends ServletContextWrapper {
+
+ public static final String SUPER = "super";
private Hashtable attributes;
private Servlet servlet;
@@ -116,7 +118,7 @@
String value = (String) this.properties.get(name);
// Ask the super block for the property
if (value == null) {
- ServletContext superContext = this.getNamedContext(Block.SUPER);
+ ServletContext superContext = this.getNamedContext(SUPER);
if (superContext != null)
value = superContext.getInitParameter(name);
}
@@ -310,7 +312,7 @@
public NamedDispatcher(String blockName) {
this.blockName = blockName;
- this.superCall = Block.SUPER.equals(this.blockName);
+ this.superCall = SUPER.equals(this.blockName);
// Call to a named block that exists in the current context
this.context = BlockContext.this.getNamedContext(this.blockName);
@@ -318,7 +320,7 @@
// If there is a super block, the connection might
// be defined there instead.
BlockContext superContext =
- (BlockContext) BlockContext.this.getNamedContext(Block.SUPER);
+ (BlockContext) BlockContext.this.getNamedContext(SUPER);
if (superContext != null) {
this.context = superContext.getNamedContext(this.blockName);
this.superCall = true;
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockCallHttpServletResponse.java Sat Mar 25 05:43:42 2006
@@ -29,13 +29,13 @@
/**
* Creates a HttpServletResponse object that is usable for internal block calls.
*
- * @version $Id:$
+ * @version $Id$
*/
public class BlockCallHttpServletResponse implements HttpServletResponse {
private OutputStream outputStream;
private ServletOutputStream servletStream;
- private OutputStreamWriter writer;
+ private PrintWriter writer;
private boolean committed;
private Locale locale;
@@ -50,21 +50,21 @@
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#addDateHeader(java.lang.String, long)
+ * @see javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, long)
*/
public void addDateHeader(String name, long date) {
// Ignore
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#addHeader(java.lang.String, java.lang.String)
+ * @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String, java.lang.String)
*/
public void addHeader(String name, String value) {
// Ignore
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#addIntHeader(java.lang.String, int)
+ * @see javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, int)
*/
public void addIntHeader(String name, int value) {
// Ignore
@@ -109,13 +109,13 @@
return null;
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#flushBuffer()
+ * @see javax.servlet.ServletResponse#flushBuffer()
*/
public void flushBuffer() throws IOException {
this.committed = true;
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#getBufferSize()
+ * @see javax.servlet.ServletResponse#getBufferSize()
*/
public int getBufferSize() {
return 0;
@@ -136,49 +136,58 @@
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#getOutputStream()
+ * @see javax.servlet.ServletResponse#getOutputStream()
*/
public ServletOutputStream getOutputStream() throws IOException {
if (this.writer != null)
throw new IllegalStateException( "Tried to create output stream; writer already exists" );
- return new ServletOutputStream() {
+ if (this.servletStream == null) {
+ this.servletStream = new ServletOutputStream() {
- /* (non-Javadoc)
- * @see java.io.OutputStream#write(int)
- */
- public void write(int b) throws IOException {
- BlockCallHttpServletResponse.this.outputStream.write(b);
- }
- };
+ /* (non-Javadoc)
+ * @see java.io.OutputStream#write(int)
+ */
+ public void write(int b) throws IOException {
+ BlockCallHttpServletResponse.this.outputStream.write(b);
+ }
+ };
+ }
+
+ return this.servletStream;
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#getWriter()
+ * @see javax.servlet.ServletResponse#getWriter()
*/
public PrintWriter getWriter() throws IOException {
if (this.servletStream != null)
throw new IllegalStateException( "Tried to create writer; output stream already exists" );
- return new PrintWriter(new OutputStreamWriter(this.outputStream, this.getCharacterEncoding()));
+ if (this.writer == null) {
+ this.writer =
+ new PrintWriter(new OutputStreamWriter(this.outputStream, this.getCharacterEncoding()));
+ }
+
+ return this.writer;
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#isCommitted()
+ * @see javax.servlet.ServletResponse#isCommitted()
*/
public boolean isCommitted() {
return this.committed;
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#reset()
+ * @see javax.servlet.ServletResponse#reset()
*/
public void reset() {
this.resetBuffer();
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#resetBuffer()
+ * @see javax.servlet.ServletResponse#resetBuffer()
*/
public void resetBuffer() {
if (this.committed)
@@ -213,14 +222,14 @@
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#setBufferSize(int)
+ * @see javax.servlet.ServletResponse#setBufferSize(int)
*/
public void setBufferSize(int size) {
// TODO Implement buffering, for the moment ignore.
}
/* (non-Javadoc)
- * @see javax.servlet.ServletResponseWrapper#setContentLength(int)
+ * @see javax.servlet.ServletResponse#setContentLength(int)
*/
public void setContentLength(int len) {
// Ignore
@@ -234,21 +243,21 @@
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#setDateHeader(java.lang.String, long)
+ * @see javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, long)
*/
public void setDateHeader(String name, long date) {
// Ignore
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#setHeader(java.lang.String, java.lang.String)
+ * @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String, java.lang.String)
*/
public void setHeader(String name, String value) {
// Ignore
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#setIntHeader(java.lang.String, int)
+ * @see javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, int)
*/
public void setIntHeader(String name, int value) {
// Ignore
@@ -265,14 +274,14 @@
this.outputStream = outputStream; }
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#setStatus(int)
+ * @see javax.servlet.http.HttpServletResponse#setStatus(int)
*/
public void setStatus(int sc) {
// Ignore
}
/* (non-Javadoc)
- * @see javax.servlet.http.HttpServletResponseWrapper#setStatus(int, java.lang.String)
+ * @see javax.servlet.http.HttpServletResponse#setStatus(int, java.lang.String)
*/
public void setStatus(int sc, String sm) {
// Ignore
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet.java Sat Mar 25 05:43:42 2006
@@ -16,6 +16,7 @@
package org.apache.cocoon.blocks.osgi;
import java.io.IOException;
+import java.io.PrintWriter;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -28,11 +29,11 @@
public class TestServlet extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- System.out.println("TestServlet:");
-
response.setContentType("text/plain");
String attr = this.getInitParameter("attr");
- response.getWriter().println("Test! " + attr);
+ PrintWriter writer = response.getWriter();
+ writer.println("Test! " + attr);
+ writer.close();
}
}
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet2.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet2.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet2.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/main/java/org/apache/cocoon/blocks/osgi/TestServlet2.java Sat Mar 25 05:43:42 2006
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.URL;
import java.net.URLConnection;
@@ -35,16 +36,14 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String path = request.getPathInfo();
- System.out.println("TestServlet2: " + path);
if ("/test1".equals(path)) {
response.setContentType("text/plain");
String attr = this.getInitParameter("attr");
- response.getWriter().println("Test! " + attr);
- response.getWriter().flush();
+ PrintWriter writer = response.getWriter();
+ writer.println("Test! " + attr);
+ writer.close();
} else if ("/test2".equals(path)) {
- System.out.println("TestServlet2: context=" + this.getServletContext());
RequestDispatcher block1 = this.getServletContext().getNamedDispatcher("block1");
- System.out.println("TestServlet2: dispatcher=" + block1);
block1.forward(request, response);
} else if ("/test3".equals(path)) {
URL url = new URL("block:/test1");
@@ -55,6 +54,8 @@
OutputStream os = response.getOutputStream();
copy(is, os);
+ is.close();
+ os.close();
} else if ("/test4".equals(path)) {
URL url = new URL("block:block1:/any");
URLConnection conn = url.openConnection();
@@ -64,6 +65,8 @@
OutputStream os = response.getOutputStream();
copy(is, os);
+ is.close();
+ os.close();
} else {
throw new ServletException("Unknown path " + path);
}
@@ -72,13 +75,7 @@
private static void copy(InputStream is, OutputStream os) throws IOException {
int bytesRead = 0;
byte buffer[] = new byte[512];
- System.out.print('[');
- while ((bytesRead = is.read(buffer)) != -1) {
- System.out.write(buffer, 0, bytesRead);
+ while ((bytesRead = is.read(buffer)) != -1)
os.write(buffer, 0, bytesRead);
- }
- System.out.println(']');
-
- is.close();
}
}
Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Block.java (from r387330, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Block.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Block.java?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Block.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Block.java&r1=387330&r2=388756&rev=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/Block.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Block.java Sat Mar 25 05:43:42 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.blocks;
+package org.apache.cocoon.blocks.servlet;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlockManager.java Sat Mar 25 05:43:42 2006
@@ -33,7 +33,6 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.blocks.Block;
import org.apache.cocoon.blocks.BlockCallStack;
import org.apache.cocoon.blocks.util.ServletConfigurationWrapper;
import org.apache.cocoon.components.LifecycleHelper;
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Blocks.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Blocks.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Blocks.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/Blocks.java Sat Mar 25 05:43:42 2006
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.blocks.servlet;
-import org.apache.cocoon.blocks.Block;
/**
* @version $Id$
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksContext.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksContext.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksContext.java Sat Mar 25 05:43:42 2006
@@ -26,7 +26,6 @@
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import org.apache.cocoon.blocks.Block;
import org.apache.cocoon.blocks.util.ServletContextWrapper;
/**
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java?rev=388756&r1=388755&r2=388756&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java Sat Mar 25 05:43:42 2006
@@ -39,7 +39,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.Modifiable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.blocks.Block;
import org.apache.cocoon.blocks.util.ServletConfigurationWrapper;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.source.SourceUtil;