You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/18 08:19:06 UTC
svn commit: r539283 - in
/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample: ./
src/main/resources/COB-INF/ src/main/resources/META-INF/
src/main/resources/META-INF/cocoon/
src/main/resources/META-INF/cocoon/spring/
Author: felixk
Date: Thu May 17 23:19:05 2007
New Revision: 539283
URL: http://svn.apache.org/viewvc?view=rev&rev=539283
Log:
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml?view=diff&rev=539283&r1=539282&r2=539283
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml Thu May 17 23:19:05 2007
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-session-fw-impl</artifactId>
-
</dependency>
</dependencies>
<pluginRepositories>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples?view=diff&rev=539283&r1=539282&r2=539283
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/session-fw.xsamples Thu May 17 23:19:05 2007
@@ -19,7 +19,7 @@
<xsamples xpath="/samples" unless="group[@name='Session Framework']">
<group name="Session Framework">
- <sample name="Session Framework Block" href="session-fw/">
+ <sample name="Session Framework Block" href="/cocoon-session-fw-sample/">
This is a demo of the session framework integrated into Cocoon.
</sample>
</group>
Added: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml?view=auto&rev=539283
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml Thu May 17 23:19:05 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.session.fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-session-fw-sample" context-path="blockcontext:/cocoon-session-fw-sample/" />
+ </bean>
+</beans>
Propchange: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id