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/15 17:08:59 UTC
svn commit: r538196 - in
/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-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: Tue May 15 08:08:58 2007
New Revision: 538196
URL: http://svn.apache.org/viewvc?view=rev&rev=538196
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.js
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xml
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml?view=diff&rev=538196&r1=538195&r2=538196
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml Tue May 15 08:08:58 2007
@@ -37,8 +37,15 @@
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-main-sample</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-cron-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.js?view=diff&rev=538196&r1=538195&r2=538196
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.js (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.js Tue May 15 08:08:58 2007
@@ -45,7 +45,7 @@
var jobname = "";
var message = "I'm here";
var sleep = "23";
- var pipeline = "samples/hello-world/hello.xml";
+ var pipeline = "cocoon-core-main-sample/hello-world/hello.xml";
var cronexpr = "";
var intervalexpr = "";
var atexpr = "";
@@ -61,7 +61,7 @@
}
// Load log file content - last logsize lines.
- var fileName = realPath + "/WEB-INF/logs/cocoon.log";
+ var fileName = realPath.substring(5) + "/../../cocoon-logs/log4j.log";
var rdr = new java.io.BufferedReader(java.io.FileReader(fileName));
var count = 0;
var lines = new java.util.LinkedList();
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xml?view=diff&rev=538196&r1=538195&r2=538196
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xml Tue May 15 08:08:58 2007
@@ -50,7 +50,7 @@
</td>
<td>${entry.schedule}</td>
<td>
- <a href="continue.${continuation.id}?action=remove&name=${entry.name}">remove</a>
+ <a href="continue.${cocoon.continuation.id}?action=remove&name=${entry.name}">remove</a>
</td>
</tr>
</jx:forEach>
@@ -67,7 +67,7 @@
Here you can define new CronJobs based on the sample class
org.apache.cocoon.components.cron.TestCronJob.
</p>
- <form method="post" action="continue.${continuation.id}?action=add">
+ <form method="post" action="continue.${cocoon.continuation.id}?action=add">
<table>
<tr>
<td align="right">Name the new job should have:</td>
@@ -150,7 +150,7 @@
<column>
<section>
<title>The Cron Scheduler Logfile</title>
- <p><a href="continue.${continuation.id}">Refresh</a></p>
+ <p><a href="continue.${cocoon.continuation.id}">Refresh</a></p>
<jx:forEach var="line" items="${log}">
<code>${line}</code><br/>
</jx:forEach>
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples?view=diff&rev=538196&r1=538195&r2=538196
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/cron.xsamples Tue May 15 08:08:58 2007
@@ -19,7 +19,7 @@
<xsamples xpath="/samples" unless="group[@name='Cron']">
<group name="Cron">
- <sample name="Cron Block" href="cron/">
+ <sample name="Cron Block" href="/cocoon-cron-sample/">
Cron block samples.
</sample>
</group>
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538196&r1=538195&r2=538196
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/COB-INF/sitemap.xmap Tue May 15 08:08:58 2007
@@ -26,7 +26,8 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+ <map:transform type="servletLinkRewriter" />
<map:serialize type="html"/>
</map:view>
@@ -49,9 +50,8 @@
<map:pipeline internal-only="false">
<map:match pattern="*.view">
<map:generate type="jx" src="{1}.xml"/>
- <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
+ <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
<map:serialize/>
</map:match>
</map:pipeline>
@@ -64,17 +64,15 @@
<map:match pattern="samples">
<map:generate src="samples.xml"/>
- <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
+ <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
<map:serialize/>
</map:match>
<map:match pattern="docs.html">
<map:generate src="docs.xml"/>
- <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
+ <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
<map:serialize/>
</map:match>
Added: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml?view=auto&rev=538196
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml Tue May 15 08:08:58 2007
@@ -0,0 +1,34 @@
+<?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.cron.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-cron-sample" context-path="blockcontext:/cocoon-cron-sample/">
+ <servlet:connections>
+ <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
+</beans>
Propchange: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/src/main/resources/META-INF/cocoon/spring/cocoon-cron-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id