Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 5733 invoked from network); 10 Oct 2004 11:53:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 Oct 2004 11:53:45 -0000 Received: (qmail 47925 invoked by uid 500); 10 Oct 2004 11:53:39 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 47832 invoked by uid 500); 10 Oct 2004 11:53:37 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 47799 invoked by uid 99); 10 Oct 2004 11:53:35 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 10 Oct 2004 04:53:32 -0700 Received: (qmail 5623 invoked by uid 65534); 10 Oct 2004 11:53:21 -0000 Date: 10 Oct 2004 11:53:21 -0000 Message-ID: <20041010115321.5621.qmail@minotaur.apache.org> From: reinhard@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 54243 - cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: reinhard Date: Sun Oct 10 04:53:20 2004 New Revision: 54243 Modified: cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java Log: over designed (merging Block with RemoteBlock) (RemoteBlock to be renamed to Block later) Modified: cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java ============================================================================== --- cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java (original) +++ cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java Sun Oct 10 04:53:20 2004 @@ -15,7 +15,8 @@ */ package org.apache.cocoon.blockdeployer.block; -import org.apache.cocoon.blockdeployer.block.Block; +import java.io.InputStream; + import org.apache.cocoon.blockdeployer.block.RemoteBlock; import org.apache.cocoon.blockdeployer.block.descriptor.BlockDescriptor; import org.apache.cocoon.blockdeployer.repository.Locator; @@ -26,8 +27,8 @@ public class RealRemoteBlock implements RemoteBlock { private Locator locator; - private Block block; private BlockDescriptor blockDescriptor; + private String blockId; public Locator getLocator() { return this.locator; @@ -37,20 +38,24 @@ this.locator = locator; } - public Block getBlock() { - return this.block; - } - - public void setBlock(Block block) { - this.block = block; - } - public BlockDescriptor getBlockDescriptor() { return this.blockDescriptor; } public void setBlockDescriptor(BlockDescriptor blockDescriptor) { this.blockDescriptor = blockDescriptor; + } + + public InputStream getStream() throws Exception { + return null; + } + + protected void setBlockId(String blockId) { + this.blockId = blockId; + } + + public String getBlockId() { + return this.blockId; } }