cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539177 - in /cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample: ./ src/main/resources/COB-INF/ src/main/resources/COB-INF/bean-editor/ src/main/resources/COB-INF/bean-editor/resources/ src/main/resources/META-INF/ src/main/resources/META-...
Date Thu, 17 May 2007 23:48:53 GMT
Author: felixk
Date: Thu May 17 16:48:52 2007
New Revision: 539177

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

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

Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/pom.xml?view=diff&rev=539177&r1=539176&r2=539177
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/pom.xml Thu May 17 16:48:52 2007
@@ -38,7 +38,18 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-tour-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-slop-impl</artifactId>
     </dependency>
   </dependencies>
 </project>

Added: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/resources/forms-sample-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/resources/forms-sample-styling.xsl?view=auto&rev=539177
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/resources/forms-sample-styling.xsl
(added)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/resources/forms-sample-styling.xsl
Thu May 17 16:48:52 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-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/resources/forms-sample-styling.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/resources/forms-sample-styling.xsl
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap?view=diff&rev=539177&r1=539176&r2=539177
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap
Thu May 17 16:48:52 2007
@@ -97,7 +97,11 @@
                 <map:transform type="forms"/>
 
                 <!-- use standard forms stylesheet to convert output of FormsTransformer
-->
-                <map:transform src="context://samples/blocks/forms/resources/forms-samples-styling.xsl"/>
+                <map:transform src="resources/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>
+                <map:transform type="servletLinkRewriter" />
 
                 <!-- and apply our standard transform after it -->
                 <map:call resource="html"/>

Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples?view=diff&rev=539177&r1=539176&r2=539177
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/tour.xsamples
Thu May 17 16:48:52 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Supersonic Tour']">
 
   <group name="Supersonic Tour">
-    <sample name="Supersonic Tour of Cocoon" href="tour/">
+    <sample name="Supersonic Tour of Cocoon" href="/cocoon-tour-sample/">
       Introduction and quick overview of the Cocoon Power Trio
         (Pipelines, Flow, Forms)
     </sample>

Added: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml?view=auto&rev=539177
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml
(added)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml
Thu May 17 16:48:52 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.tour.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-tour-sample" context-path="blockcontext:/cocoon-tour-sample/">
+            <servlet:connections>
+                <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
+                <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+            </servlet:connections>
+        </servlet:context>
+    </bean>
+</beans>

Propchange: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message