Return-Path: 
 <cvs-return-30652-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 99581 invoked from network); 16 May 2007 11:54:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 May 2007 11:54:27 -0000
Received: (qmail 49915 invoked by uid 500); 16 May 2007 11:54:33 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 49865 invoked by uid 500); 16 May 2007 11:54:32 -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 49854 invoked by uid 99); 16 May 2007 11:54:32 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2007 04:54:32 -0700
X-ASF-Spam-Status: No, hits=-99.5 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; Wed, 16 May 2007 04:54:25 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9848A1A983E; Wed, 16 May 2007 04:54:04 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r538550 - in
 /cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample: ./
 src/main/resources/COB-INF/ src/main/resources/META-INF/
 src/main/resources/META-INF/cocoon/
 src/main/resources/META-INF/cocoon/spring/
Date: Wed, 16 May 2007 11:54:04 -0000
To: cvs@cocoon.apache.org
From: felixk@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070516115404.9848A1A983E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: felixk
Date: Wed May 16 04:54:03 2007
New Revision: 538550

URL: http://svn.apache.org/viewvc?view=rev&rev=538550
Log:
- move to servlet-service
- add blockServlet bean

Added:
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml   (with props)
Modified:
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml?view=diff&rev=538550&r1=538549&r2=538550
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml Wed May 16 04:54:03 2007
@@ -38,7 +38,18 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-petstore-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-xsp-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-velocity-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-databases-hsqldb-server</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples?view=diff&rev=538550&r1=538549&r2=538550
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/petstore.xsamples Wed May 16 04:54:03 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Petstore']">
 
   <group name="Petstore">
-    <sample name="Petstore Block" href="petstore/">
+    <sample name="Petstore Block" href="/cocoon-petstore-sample/">
       The Cocoon Flow version of the J2EE PetStore, using various presentation
       mechanisms: CocoonForms (Woody), Velocity, XSP, Jexl.
     </sample>

Added: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml?view=auto&rev=538550
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml Wed May 16 04:54:03 2007
@@ -0,0 +1,29 @@
+<?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"
+       xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+    <bean id="org.apache.cocoon.petstore.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-petstore-sample" context-path="blockcontext:/cocoon-petstore-sample/" />
+    </bean>
+</beans>

Propchange: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id