cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r538544 - in /cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample: ./ src/main/resources/COB-INF/ src/main/resources/COB-INF/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/ src/main/resources/META-INF/cocoon/spring/
Date Wed, 16 May 2007 11:38:42 GMT
Author: felixk
Date: Wed May 16 04:38:41 2007
New Revision: 538544

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

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

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml?view=diff&rev=538544&r1=538543&r2=538544
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml Wed May 16 04:38:41 2007
@@ -38,25 +38,33 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-mocks</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-sample</artifactId>
-      
     </dependency>
 <!--  For now we have to depend on the querybean block as the ojb configuration contains
           mappings for some beans from the querybean block :( -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-querybean-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-forms-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-ajax-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/ojb.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/ojb.xsamples?view=diff&rev=538544&r1=538543&r2=538544
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/ojb.xsamples
(original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/ojb.xsamples
Wed May 16 04:38:41 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='OJB']">
 
   <group name="OJB">
-    <sample name="OJB Block" href="ojb/">
+    <sample name="OJB Block" href="/cocoon-ojb-sample/">
       Apache Object/Relational Bridge.
     </sample>
   </group>

Added: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl?view=auto&rev=538544
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
(added)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
Wed May 16 04:38:41 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-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/resources/forms-samples-styling.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538544&r1=538543&r2=538544
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/src/main/resources/COB-INF/sitemap.xmap
Wed May 16 04:38:41 2007
@@ -22,8 +22,8 @@
     <map:transformers default="xslt">
       <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="other">
-          <catalogue id="other" name="OtherMessages" location="context://samples/blocks/forms/messages"/>
-          <catalogue id="forms" name="FormsMessages" location="context://samples/blocks/forms/messages"/>
+          <catalogue id="other" name="OtherMessages" location="servlet:forms:/resource/internal/i18n"/>
+          <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"
/>
         </catalogues>
         <cache-at-startup>true</cache-at-startup>
       </map:transformer>
@@ -37,7 +37,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>
 
@@ -58,21 +59,20 @@
 
       <map:match pattern="">
         <map:generate src="welcome.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="*/xspdemo">
         <map:generate src="{1}/xsp/demo1.xsp" type="serverpages"/>
-        <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
+        <map:transform src="servlet:style-default:/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="jdo/xsp/xspdemo.xsp"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 
@@ -94,26 +94,29 @@
         <map:transform type="i18n">
           <map:parameter name="locale" value="en-US"/>
         </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 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 src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
           <map:parameter name="servletPath" value="{request:servletPath}"/>
           <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
           <map:parameter name="file" value="forms/employee.xml"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 
       <map:match pattern="jdo/forms/employee-form-success">
         <map:generate type="serverpages" src="forms/success.xsp"/>
-        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
           <map:parameter name="servletPath" value="{request:servletPath}"/>
           <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
           <map:parameter name="file" value="forms/success.xsp"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
+        <map:transform type="servletLinkRewriter" />
         <map:serialize/>
       </map:match>
 

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

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



Mime
View raw message