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 09:50:22 UTC
svn commit: r539301 - in /cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample:
./ src/main/resources/COB-INF/ src/main/resources/COB-INF/database/
src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/
src/main/resources/META-INF/cocoon/spring/
Author: felixk
Date: Fri May 18 00:50:21 2007
New Revision: 539301
URL: http://svn.apache.org/viewvc?view=rev&rev=539301
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml?view=diff&rev=539301&r1=539300&r2=539301
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml Fri May 18 00:50:21 2007
@@ -38,7 +38,14 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jms-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xsp-impl</artifactId>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap?view=diff&rev=539301&r1=539300&r2=539301
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap Fri May 18 00:50:21 2007
@@ -23,13 +23,22 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- =========================== Components =================================== -->
+
<map:components>
+
+ <!-- =========================== Matchers =================================== -->
+
<map:matchers default="wildcard">
<map:matcher name="host-matcher" logger="sitemap.matcher.wildcard" src="org.apache.cocoon.matching.modular.CachingWildcardMatcher">
<input-module name="request" />
<parameter-name>serverName</parameter-name>
</map:matcher>
</map:matchers>
+
+ <!-- =========================== Actions =================================== -->
+
<map:actions>
<map:action name="cacheevent" src="org.apache.cocoon.acting.CacheEventAction" />
<map:action name="jmsevent" src="org.apache.cocoon.acting.JMSPublisherAction" logger="sitemap.actions.jms">
@@ -38,34 +47,37 @@
</map:action>
</map:actions>
+ <!-- =========================== Pipes =================================== -->
+
<map:pipes default="caching">
<!-- A pipe must be defined configured to use the EventAware cache. -->
<map:pipe name="event-aware" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
<parameter name="cache-role" value="org.apache.cocoon.caching.Cache/EventAware" />
</map:pipe>
</map:pipes>
+
</map:components>
+ <!-- =========================== Views =================================== -->
+
<map:views>
- <map:view from-label="content" name="content">
+ <map:view name="content" from-label="content">
<map:serialize type="xml" />
</map:view>
</map:views>
+ <!-- =========================== Pipelines ================================= -->
+
<map:pipelines>
<!-- Our content must occur in a pipeline configured to use our Event Aware cache -->
<map:pipeline type="event-aware">
<map:match pattern="eventcache">
<map:generate type="serverpages" src="{0}.xsp" />
- <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}" />
- <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
- <map:parameter name="contextPath" value="{request:contextPath}" />
- <map:parameter name="file" value="{0}.xsp" />
- <map:parameter name="remove" value="{0}" />
- </map:transform>
- <map:serialize />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
</map:match>
</map:pipeline>
@@ -97,14 +109,10 @@
<map:match pattern="*">
<map:generate type="serverpages" src="{1}.xsp" />
- <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}" />
- <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
- <map:parameter name="contextPath" value="{request:contextPath}" />
- <map:parameter name="file" value="{1}.xsp" />
- <map:parameter name="remove" value="{0}" />
- </map:transform>
- <map:serialize />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
</map:match>
</map:pipeline>
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples?view=diff&rev=539301&r1=539300&r2=539301
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/jms.xsamples Fri May 18 00:50:21 2007
@@ -18,7 +18,7 @@
<xsamples xpath="/samples" unless="group[@name='JMS']">
<group name="JMS">
- <sample name="JMS Block" href="jms/database/">
+ <sample name="JMS Block" href="/cocoon-jms-sample/database/">
JMS invalidated Event Based Cache.
A sample showing external cache invalidation using database triggers
emitting either JMS messages or HTTP requests. For this sample, the
Added: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml?view=auto&rev=539301
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml Fri May 18 00:50:21 2007
@@ -0,0 +1,33 @@
+<?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.jms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-jms-sample" context-path="blockcontext:/cocoon-jms-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
+</beans>
Propchange: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id