cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538511 - in /cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample: ./ src/main/resources/COB-INF/ src/main/resources/COB-INF/stylesheets/ src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/ src/main/resources/META-INF/cocoon...
Date Wed, 16 May 2007 09:59:56 GMT
Author: felixk
Date: Wed May 16 02:59:55 2007
New Revision: 538511

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

Added:
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
  (with props)
Modified:
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/lucene-index2html.xsl
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search-index2html.xsl
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search2html.xsl

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml?view=diff&rev=538511&r1=538510&r2=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml Wed May 16 02:59:55 2007
@@ -38,7 +38,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-lucene-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples?view=diff&rev=538511&r1=538510&r2=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/lucene.xsamples
Wed May 16 02:59:55 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Lucene']">
 
   <group name="Lucene">
-    <sample name="Lucene Block" href="lucene/welcome">
+    <sample name="Lucene Block" href="/cocoon-lucene-sample/">
       Examples showing use of Apache Lucene to search.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538511&r1=538510&r2=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap
Wed May 16 02:59:55 2007
@@ -45,7 +45,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>
 
@@ -66,6 +67,10 @@
   
   <map:pipeline>
   	
+    <map:match pattern="">
+      <map:redirect-to uri="welcome"/>
+    </map:match>
+
     <!-- mount query bean pipelines
       <map:match pattern="query/**">
         <map:mount src="query/sitemap.xmap" uri-prefix="query"/>
@@ -82,6 +87,7 @@
       <map:generate type="search"/>
       <map:transform type="log"/>
       <map:transform src="stylesheets/search2html.xsl"/>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize/>
     </map:match>
 
@@ -91,14 +97,14 @@
       </map:generate>
       <map:transform type="log"/>
       <map:transform src="stylesheets/search-index2html.xsl"/>
+      <map:transform type="servletLinkRewriter" />
       <map:serialize/>
     </map:match>
 
     <map:match pattern="welcome">
       <map:generate src="welcome-index.xml"/>
-      <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
-        <map:parameter name="contextPath" value="{request:contextPath}"/>
-      </map:transform>
+      <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl" />
+      <map:transform type="servletLinkRewriter" />
       <map:serialize/>
     </map:match>
 
@@ -108,9 +114,8 @@
 
     <map:match pattern="create-index.jx">
       <map:generate type="jx" src="create-index.jx"/>
-      <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
-        <map:parameter name="contextPath" value="{request:contextPath}"/>
-      </map:transform>
+      <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl" />
+      <map:transform type="servletLinkRewriter" />
       <map:serialize/>
     </map:match>
 

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/lucene-index2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/lucene-index2html.xsl?view=diff&rev=538511&r1=538510&r2=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/lucene-index2html.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/lucene-index2html.xsl
Wed May 16 02:59:55 2007
@@ -26,7 +26,7 @@
     <html>
       <head>
         <title>Lucene Index</title>
-        <link title="Default Style" href="/styles/main.css" rel="stylesheet"/>
+        <link title="Default Style" href="servlet:style-default:/styles/main.css" rel="stylesheet"/>
       </head>
       <body >
         <a href="http://jakarta.apache.org/lucene/">

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search-index2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search-index2html.xsl?view=diff&rev=538511&r1=538510&r2=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search-index2html.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search-index2html.xsl
Wed May 16 02:59:55 2007
@@ -26,7 +26,7 @@
     <html>
       <head>
         <title>Index2 Search</title>
-        <link title="Default Style" href="/styles/main.css" rel="stylesheet"/>
+        <link title="Default Style" href="servlet:style-default:/styles/main.css" rel="stylesheet"/>
       </head>
       <body bgcolor="white" alink="red" link="blue" vlink="blue">
         <a href="http://jakarta.apache.org/lucene/">

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search2html.xsl?view=diff&rev=538511&r1=538510&r2=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search2html.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/stylesheets/search2html.xsl
Wed May 16 02:59:55 2007
@@ -26,7 +26,7 @@
     <html>
       <head>
         <title>Index Search</title>
-        <link title="Default Style" href="/styles/main.css" rel="stylesheet"/>
+        <link title="Default Style" href="servlet:style-default:/styles/main.css" rel="stylesheet"/>
       </head>
       <body bgcolor="white" alink="red" link="blue" vlink="blue">
         <a href="http://jakarta.apache.org/lucene/">

Added: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml?view=auto&rev=538511
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
Wed May 16 02:59:55 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.lucene.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-lucene-sample" context-path="blockcontext:/cocoon-lucene-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-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message