Return-Path: 
 <cvs-return-27632-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 50462 invoked from network); 16 Jul 2006 12:58:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 16 Jul 2006 12:58:26 -0000
Received: (qmail 28378 invoked by uid 500); 16 Jul 2006 12:58:25 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 28320 invoked by uid 500); 16 Jul 2006 12:58:25 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 28309 invoked by uid 99); 16 Jul 2006 12:58:25 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jul 2006 05:58:25 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jul 2006 05:58:24 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 541551A981A; Sun, 16 Jul 2006 05:57:58 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r422436 - in
 /cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample: pom.xml
 src/main/resources/COB-INF/sitemap.xmap
Date: Sun, 16 Jul 2006 12:57:57 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060716125758.541551A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: reinhard
Date: Sun Jul 16 05:57:57 2006
New Revision: 422436

URL: http://svn.apache.org/viewvc?rev=422436&view=rev
Log:
Apples block samples except the forms samples work now

Modified:
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml?rev=422436&r1=422435&r2=422436&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml Sun Jul 16 05:57:57 2006
@@ -59,12 +59,6 @@
           </connectors>
           <webAppSourceDirectory>target/cocoon-apples-sample</webAppSourceDirectory>
           <contextPath>/</contextPath>
-          <systemProperties>
-            <systemProperty>
-              <name>org.apache.commons.logging.Log</name>
-              <value>org.apache.commons.logging.impl.SimpleLog</value>
-            </systemProperty>
-          </systemProperties>
         </configuration>
       </plugin>      
     </plugins>
@@ -90,7 +84,12 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
       <version>1.0.0-SNAPSHOT</version>
-    </dependency>             
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>                   
   </dependencies>
 
 </project>

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap?rev=422436&r1=422435&r2=422436&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/COB-INF/sitemap.xmap Sun Jul 16 05:57:57 2006
@@ -43,7 +43,7 @@
     </map:view>
 
     <map:view from-label="content" name="pretty-content">
-      <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+      <map:transform src="block:cocoon-samples-style-default:stylesheets/system/xml2html.xslt"/>
       <map:serialize type="html"/>
     </map:view>
 
@@ -52,13 +52,12 @@
     </map:view>
   </map:views>
 
-
   <map:resources>
     <map:resource name="serialize-jx-screen" >
-      <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
+      <map:transform src="block:cocoon-samples-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="contextPath" value="{request:contextPath}"/>
+        <map:parameter name="contextPath" value="/blocks/cocoon-samples-style-default"/>
         <map:parameter name="file" value="/samples/apples/{screen-src}"/>
         <map:parameter name="remove" value="{0}"/>
       </map:transform>
@@ -66,17 +65,15 @@
     </map:resource>
   </map:resources>
 
-
   <map:flow language="apples"/>
 
-
   <map:pipelines>
     <map:pipeline>
 
       <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 src="block:cocoon-samples-style-default:common/style/xsl/html/simple-samples2html.xsl">
+          <map:parameter name="contextPath" value="/blocks/cocoon-samples-style-default"/>
         </map:transform>
         <map:serialize/>
       </map:match>
@@ -93,15 +90,15 @@
           |   Binding form sample, reuses pipelines stolen from Cocoon Forms
           +-->
 
-      <map:match pattern="form2xml.flow">
+      <!--map:match pattern="form2xml.flow">
         <map:call function="org.apache.cocoon.components.flow.apples.samples.BindingWoodyApple">
-          <map:parameter name="form-src" value="context://samples/blocks/forms/forms/form2_model.xml"/>
-          <map:parameter name="binding-src" value="context://samples/blocks/forms/forms/form2_bind_xml.xml"/>
-          <map:parameter name="documentURI" value="context://samples/blocks/forms/forms/form2_data.xml"/>
-          <map:parameter name="form-pipe" value="/samples/blocks/forms/form2-display-pipeline"/>
-          <map:parameter name="valid-pipe" value="/samples/blocks/forms/form2-success-pipeline"/>
+          <map:parameter name="form-src" value="block:cocoon-samples-style-default:blocks/forms/forms/form2_model.xml"/>
+          <map:parameter name="binding-src" value="block:cocoon-forms-sample:forms-data/form2_bind_xml.xml"/>
+          <map:parameter name="documentURI" value="block:cocoon-forms-sample:forms-data/form2_data.xml"/>
+          <map:parameter name="form-pipe" value="block:cocoon-forms-sample:forms/form2-display-pipeline"/>
+          <map:parameter name="valid-pipe" value="block:cocoon-forms-sample:forms/form2-success-pipeline"/>
         </map:call>
-      </map:match>
+      </map:match-->
 
 
       <!--+ 
@@ -112,17 +109,17 @@
         <map:call function="org.apache.cocoon.components.flow.apples.samples.CalculationApple"/>
       </map:match>
 
-      <map:match pattern="calc/*">
-        <map:generate type="jx" src="context://blocks/cocoon-core-samples-main-sample/flow/jxcalc/screens/{1}.xml"/>
-        <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
+      <!--map:match pattern="calc/*">
+        <map:generate type="jx" src="block:cocoon-core-samples-main-sample:flow/jxcalc/screens/{1}.xml"/>
+        <map:transform src="block:cocoon-samples-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="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="file" value="blocks/cocoon-core-samples-main-sample/flow/jxcalc/screens/{1}.xml"/>
+          <map:parameter name="file" value="block:cocoon-core-samples-main-sample:flow/jxcalc/screens/{1}.xml"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
         <map:serialize/>
-      </map:match>
+      </map:match-->
 
 
       <!--+