svn commit: r375733 - in /cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon: blocks/util/ components/source/impl/

[da...@apache.org]

Author: danielf
Date: Tue Feb  7 13:57:23 2006
New Revision: 375733

URL: http://svn.apache.org/viewcvs?rev=375733&view=rev
Log:
The request and response wrappers are specific for the block source, better put them in the same package.

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletRequestWrapper.java
      - copied, changed from r375725, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletRequestWrapper.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletResponseWrapper.java
      - copied, changed from r375725, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletResponseWrapper.java
Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletRequestWrapper.java
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletResponseWrapper.java
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockSource.java

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletRequestWrapper.java (from r375725, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletRequestWrapper.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletRequestWrapper.java?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletRequestWrapper.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletRequestWrapper.java&r1=375725&r2=375733&rev=375733&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletRequestWrapper.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletRequestWrapper.java Tue Feb  7 13:57:23 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blocks.util;
+package org.apache.cocoon.components.source.impl;
 
 import java.net.URI;
 import java.util.Enumeration;
@@ -33,7 +33,7 @@
  * 
  * @version $Id$
  */
-public class BlockHttpServletRequestWrapper extends HttpServletRequestWrapper {
+class BlockHttpServletRequestWrapper extends HttpServletRequestWrapper {
     
     private URI uri;
     private Hashtable attributes = new Hashtable();

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletResponseWrapper.java (from r375725, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletResponseWrapper.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletResponseWrapper.java?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletResponseWrapper.java&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletResponseWrapper.java&r1=375725&r2=375733&rev=375733&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/util/BlockHttpServletResponseWrapper.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockHttpServletResponseWrapper.java Tue Feb  7 13:57:23 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blocks.util;
+package org.apache.cocoon.components.source.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -31,7 +31,7 @@
  * 
  * @version $Id$
  */
-public class BlockHttpServletResponseWrapper extends HttpServletResponseWrapper {
+class BlockHttpServletResponseWrapper extends HttpServletResponseWrapper {
 
     private OutputStream outputStream;
     private ServletOutputStream servletStream;

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockSource.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockSource.java?rev=375733&r1=375732&r2=375733&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockSource.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/source/impl/BlockSource.java Tue Feb  7 13:57:23 2006
@@ -33,8 +33,6 @@
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.blocks.BlockCallStack;
-import org.apache.cocoon.blocks.util.BlockHttpServletRequestWrapper;
-import org.apache.cocoon.blocks.util.BlockHttpServletResponseWrapper;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.environment.http.HttpEnvironment;
 import org.apache.cocoon.environment.internal.EnvironmentHelper;