cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539293 - in /cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-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/...
Date Fri, 18 May 2007 07:03:15 GMT
Author: felixk
Date: Fri May 18 00:03:14 2007
New Revision: 539293

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

Added:
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl
  (with props)
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
  (with props)
Modified:
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml?view=diff&rev=539293&r1=539292&r2=539293
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml Fri May 18 00:03:14
2007
@@ -38,7 +38,18 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-querybean-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-ajax-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-forms-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples?view=diff&rev=539293&r1=539292&r2=539293
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/querybean.xsamples
Fri May 18 00:03:14 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='QueryBean']">
 
   <group name="QueryBean">
-    <sample name="Query Bean" href="querybean/welcome">
+    <sample name="Query Bean" href="/cocoon-querybean-sample/">
       Examples showing the use of Apache Lucene with CForms to search.
     </sample>
   </group>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539293&r1=539292&r2=539293
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
Fri May 18 00:03:14 2007
@@ -26,7 +26,7 @@
             <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
                 <catalogues default="forms">
                     <catalogue id="local" name="messages" location="i18n" />
-                    <catalogue id="forms" name="FormsMessages" location="context://samples/blocks/forms/messages"
/>
+                    <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n"
/>
                 </catalogues>
                 <cache-at-startup>true</cache-at-startup>
             </map:transformer>
@@ -50,14 +50,15 @@
         </map:view>
 
         <map:view from-label="content" name="pretty-content">
-            <map:transform src="context://stylesheets/system/xml2html.xslt" />
-            <map:serialize type="html" />
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
         </map:view>
 
         <map:view name="links" from-position="last">
             <map:serialize type="links" />
         </map:view>
-
     </map:views>
 
     <!-- =========================== Pipelines ================================= -->
@@ -76,11 +77,14 @@
                     <map:transform type="i18n">
                         <map:parameter name="locale" value="{../locale}" />
                     </map:transform>
-                    <map:transform src="context://samples/blocks/forms/resources/forms-samples-styling.xsl"
/>
-                    <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-                        <map:parameter name="contextPath" value="{request:contextPath}"
/>
-                    </map:transform>
-                    <map:serialize />
+                    <map:transform src="stylesheets/forms-samples-styling.xsl">
+                        <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}"
/>
+                        <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}"
/>
+                    </map:transform>
+                    <!-- Make use of servlet services -->
+                    <map:serialize type="servletService">
+                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html"
/>
+                    </map:serialize>
                 </map:match>
 
                 <!-- prepare the document for indexing -->
@@ -96,10 +100,10 @@
                     <map:transform type="cinclude" />
                     <map:transform type="lucene-indexer" />
                     <map:transform src="stylesheets/lucene2simple-page.xsl" />
-                    <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-                        <map:parameter name="contextPath" value="{request:contextPath}"
/>
-                    </map:transform>
-                    <map:serialize />
+                    <!-- Make use of servlet services -->
+                    <map:serialize type="servletService">
+                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html"
/>
+                    </map:serialize>
                 </map:match>
 
                 <!-- displays the rest of the screens -->
@@ -108,10 +112,10 @@
                     <map:transform type="i18n">
                         <map:parameter name="locale" value="{../locale}" />
                     </map:transform>
-                    <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-                        <map:parameter name="contextPath" value="{request:contextPath}"
/>
-                    </map:transform>
-                    <map:serialize />
+                    <!-- Make use of servlet services -->
+                    <map:serialize type="servletService">
+                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html"
/>
+                    </map:serialize>
                 </map:match>
 
             </map:act>

Added: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl?view=auto&rev=539293
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl
(added)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl
Fri May 18 00:03:14 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!--+ Include styling stylesheets, one for the widgets, the other one for the
+      | page. As 'forms-advanced-field-styling.xsl' is a specialization of
+      | 'forms-field-styling.xsl' the latter one is imported there. If you don't
+      | want advanced styling of widgets, change it here!
+      | See xsl:include as composition and xsl:import as extension/inheritance.
+      +-->
+  <xsl:include href="servlet:forms:/resource/internal/xsl/forms-page-styling.xsl"/>
+  <xsl:include href="servlet:forms:/resource/internal/xsl/forms-advanced-field-styling.xsl"/>
+
+  <!-- Location of the resources directories, where JS libs and icons are stored -->
+  <xsl:param name="dojo-resources"/>
+  <xsl:param name="forms-resources"/>
+  
+  <xsl:template match="head">
+    <head>
+      <xsl:apply-templates select="." mode="forms-page"/>
+      <xsl:apply-templates select="." mode="forms-field"/>
+      <xsl:apply-templates/>
+    </head>
+  </xsl:template>
+
+  <xsl:template match="body">
+    <body>
+      <!--+ !!! If template with mode 'forms-page' adds text or elements
+          |        template with mode 'forms-field' can no longer add attributes!!!
+          +-->
+      <xsl:apply-templates select="." mode="forms-page"/>
+      <xsl:apply-templates select="." mode="forms-field"/>
+      <xsl:apply-templates/>
+    </body>
+  </xsl:template>
+
+</xsl:stylesheet>

Propchange: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/stylesheets/forms-samples-styling.xsl
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml?view=auto&rev=539293
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
Fri May 18 00:03:14 2007
@@ -0,0 +1,35 @@
+<?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.querybean.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-querybean-sample" context-path="blockcontext:/cocoon-querybean-sample/">
+            <servlet:connections>
+                <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+                <entry key="forms" value-ref="org.apache.cocoon.forms.impl.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-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message