Return-Path: 
 <cvs-return-27398-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 80634 invoked from network); 19 Jun 2006 17:16:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Jun 2006 17:16:59 -0000
Received: (qmail 40844 invoked by uid 500); 19 Jun 2006 17:16:58 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 40796 invoked by uid 500); 19 Jun 2006 17:16:58 -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 40760 invoked by uid 99); 19 Jun 2006 17:16:58 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 10:16:58 -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; Mon, 19 Jun 2006 10:16:57 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 969F01A983A; Mon, 19 Jun 2006 10:16:37 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r415375 - in
 /cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample: pom.xml
 src/main/resources/COB-INF/sitemap.xmap
Date: Mon, 19 Jun 2006 17:16:37 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060619171637.969F01A983A@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: Mon Jun 19 10:16:36 2006
New Revision: 415375

URL: http://svn.apache.org/viewvc?rev=415375&view=rev
Log:
add plugins to pom so that the samples run 'stand-alone'; fix paths in sitemap; doesn't work yet as there are dependencies on cocoon-webapp which have to move into a block that can be refered to

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=415375&r1=415374&r2=415375&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml Mon Jun 19 10:16:36 2006
@@ -38,12 +38,59 @@
   <name>apples Block Samples</name>
   <description></description>
   
+  <build>
+    <finalName>cocoon-apples-sample</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-deployer-plugin</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+      </plugin>      
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty6-plugin</artifactId>
+        <version>6.0.0beta10</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>8888</port>
+              <maxIdleTime>30000</maxIdleTime>
+            </connector>
+          </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>
+  </build>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-apples-impl</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core-samples-main-sample</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>   
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-template-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>   
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-forms-impl</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=415375&r1=415374&r2=415375&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 Mon Jun 19 10:16:36 2006
@@ -113,12 +113,12 @@
       </map:match>
 
       <map:match pattern="calc/*">
-        <map:generate type="jx" src="context://samples/flow/jxcalc/screens/{1}.xml"/>
+        <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: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="samples/flow/jxcalc/screens/{1}.xml"/>
+          <map:parameter name="file" value="blocks/cocoon-core-samples-main-sample/flow/jxcalc/screens/{1}.xml"/>
           <map:parameter name="remove" value="{0}"/>
         </map:transform>
         <map:serialize/>