Return-Path: 
 <cvs-return-28881-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 97303 invoked from network); 11 Nov 2006 15:49:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Nov 2006 15:49:07 -0000
Received: (qmail 69948 invoked by uid 500); 11 Nov 2006 15:49:18 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 69828 invoked by uid 500); 11 Nov 2006 15:49:17 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 69817 invoked by uid 99); 11 Nov 2006 15:49:17 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Nov 2006 07:49:17 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Nov 2006 07:49:06 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5F2AA1A9846; Sat, 11 Nov 2006 07:48:37 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r473740 - in /cocoon/trunk:
 blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/
 blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/
 blocks/cocoon-forms/cocoon-forms-sampl...
Date: Sat, 11 Nov 2006 15:48:37 -0000
To: cvs@cocoon.apache.org
From: danielf@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061111154837.5F2AA1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: danielf
Date: Sat Nov 11 07:48:36 2006
New Revision: 473740

URL: http://svn.apache.org/viewvc?view=rev&rev=473740
Log:
Use block context source in block fw samples.

Added:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/
    cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/spring/
    cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/spring/cocoon-template-blockServlet.xml
Modified:
    cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet1.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet2.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet3.xml

Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml?view=diff&rev=473740&r1=473739&r2=473740
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml Sat Nov 11 07:48:36 2006
@@ -23,6 +23,6 @@
 	<bean id="org.apache.cocoon.ajax.block" class="org.apache.cocoon.blocks.BlockServlet">
 		<property name="mountPath" value="/cocoon-ajax-sample"/>
 		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-		<property name="blockContextURL" value="/blocks/cocoon-ajax-sample"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-ajax-sample/"/>
 	</bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml?view=diff&rev=473740&r1=473739&r2=473740
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml Sat Nov 11 07:48:36 2006
@@ -23,6 +23,6 @@
 	<bean id="org.apache.cocoon.core.main.block" class="org.apache.cocoon.blocks.BlockServlet">
 		<property name="mountPath" value="/cocoon-core-main-sample"/>
 		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-		<property name="blockContextURL" value="/blocks/cocoon-core-main-sample"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-core-main-sample/"/>
 	</bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml?view=diff&rev=473740&r1=473739&r2=473740
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml Sat Nov 11 07:48:36 2006
@@ -23,6 +23,6 @@
 	<bean id="org.apache.cocoon.forms.block" class="org.apache.cocoon.blocks.BlockServlet">
 		<property name="mountPath" value="/cocoon-forms-sample"/>
 		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-		<property name="blockContextURL" value="/blocks/cocoon-forms-sample"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-forms-sample/"/>
 	</bean>
 </beans>

Added: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/spring/cocoon-template-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/spring/cocoon-template-blockServlet.xml?view=auto&rev=473740
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/spring/cocoon-template-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INFO/spring/cocoon-template-blockServlet.xml Sat Nov 11 07:48:36 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	<bean id="org.apache.cocoon.template.block" class="org.apache.cocoon.blocks.BlockServlet">
+		<property name="mountPath" value="/cocoon-template-sample"/>
+		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-template-sample/"/>
+	</bean>
+</beans>
\ No newline at end of file

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet1.xml?view=diff&rev=473740&r1=473739&r2=473740
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet1.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet1.xml Sat Nov 11 07:48:36 2006
@@ -23,7 +23,7 @@
 	<bean id="org.apache.cocoon.blocks.sample.block1" class="org.apache.cocoon.blocks.BlockServlet">
 		<property name="mountPath" value="/cocoon-blocks-fw-sample1"/>
 		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-		<property name="blockContextURL" value="/blocks/cocoon-blocks-fw-sample/test1"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-blocks-fw-sample/test1"/>
 		<property name="properties">
 			<map>
 				<entry key="foo" value="bar"/>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet2.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet2.xml?view=diff&rev=473740&r1=473739&r2=473740
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet2.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet2.xml Sat Nov 11 07:48:36 2006
@@ -23,6 +23,6 @@
 	<bean id="org.apache.cocoon.blocks.sample.block2" class="org.apache.cocoon.blocks.BlockServlet">
 		<property name="mountPath" value="/cocoon-blocks-fw-sample2"/>
 		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-		<property name="blockContextURL" value="/blocks/cocoon-blocks-fw-sample/test2"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-blocks-fw-sample/test2"/>
 	</bean>
 </beans>

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet3.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet3.xml?view=diff&rev=473740&r1=473739&r2=473740
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet3.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-blocks-fw-sample-blockServlet3.xml Sat Nov 11 07:48:36 2006
@@ -23,7 +23,7 @@
 	<bean id="org.apache.cocoon.blocks.sample.block3" class="org.apache.cocoon.blocks.BlockServlet">
 		<property name="mountPath" value="/cocoon-blocks-fw-sample3"/>
 		<property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-		<property name="blockContextURL" value="/blocks/cocoon-blocks-fw-sample/test3"/>
+		<property name="blockContextURL" value="blockcontext:/cocoon-blocks-fw-sample/test3"/>
 		<property name="properties">
 			<map>
 				<entry key="bar" value="gazonk"/>